From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 20 Jul 2014 13:51:15 +0000 (+0100)
Subject: init/tripe-init.in, contrib/tripe-upstart.in: Reformat startup rune.
X-Git-Tag: 1.0.0pre16~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/85b239ad6c917a76b8ab81fc182c03d28255bdcb

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 aa6e4193..42d15de0 100644
--- 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 d04f42f3..7a21c4ad 100755
--- 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