init/tripe-init.in, contrib/tripe-upstart.in: Reformat startup rune.

  * The old ${var+-O}${var} rune was kind of pointless: rewrite it as
    ${var+-O$var} instead.

  * Remove other pointless braces.

  * Group the addr/port and user/group options together.

diff --git a/contrib/tripe-upstart.in b/contrib/tripe-upstart.in
index aa6e41936ef4dfc7b2e6d45d5a39712817766198..42d15de01cbfe9a5851ae120d39df6f9f4a9ebc4 100644 (file)
--- a/contrib/tripe-upstart.in
+++ b/contrib/tripe-upstart.in
@@ -144,16 +144,15 @@ script
 
        ## Start the server, passing lots of arguments.
        $tripectl -s -p$tripe \
-         -f${logfile-/var/log/tripe.log} \
          -P$pidfile \
-         ${keytag+-S-t}$keytag \
-         ${addr+-S-b}$addr \
-         ${port+-S-p}${port} \
-         ${user+-U}${user} \
-         ${group+-G}${group} \
-         ${trace+-S-T}${trace} \
-         ${tunnel+-S-n}${tunnel} \
-         ${miscopts}
+         -f${logfile-@logfile@} \
+         ${keytag+-S-t$keytag} \
+         ${addr+-S-b$addr} ${port+-S-p$port} \
+         ${user+-U$user} ${group+-G$group} \
+         ${sockmode+-S-m$sockmode} \
+         ${trace+-S-T$trace} \
+         ${tunnel+-S-n$tunnel} \
+         $miscopts
 
 end script
 

diff --git a/init/tripe-init.in b/init/tripe-init.in
index d04f42f3233ea81fe071a96fbfa1d7296bdcfb83..7a21c4ad605df72b6d9c0854f500be88d4250397 100755 (executable)
--- a/init/tripe-init.in
+++ b/init/tripe-init.in
@@ -134,17 +134,15 @@ case "$1" in
 
     ## Start the server, passing lots of arguments.
     $tripectl -D -s -p$tripe \
-      -f${logfile-@logfile@} \
       -P$pidfile \
-      ${keytag+-S-t}$keytag \
-      ${addr+-S-b}$addr \
-      ${port+-S-p}${port} \
-      ${user+-U}${user} \
-      ${group+-G}${group} \
-      ${sockmode+-S-m}${sockmode} \
-      ${trace+-S-T}${trace} \
-      ${tunnel+-S-n}${tunnel} \
-      ${miscopts}
+      -f${logfile-@logfile@} \
+      ${keytag+-S-t$keytag} \
+      ${addr+-S-b$addr} ${port+-S-p$port} \
+      ${user+-U$user} ${group+-G$group} \
+      ${sockmode+-S-m$sockmode} \
+      ${trace+-S-T$trace} \
+      ${tunnel+-S-n$tunnel} \
+      $miscopts
 
     ## Wait for the server to start up.  This doesn't usually take long.
     for i in 1 2 3 4 give-up; do