Convert some bash-specific syntax to standard Bourne shell (RT #194).

interchange · May 13, 2008 · 2cc3ec8 · 2cc3ec8
1 parent caba107
commit 2cc3ec8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/WHATSNEW-5.5 b/WHATSNEW-5.5
@@ -150,6 +150,8 @@ Packaging
   deprecated, so make sure a copy is available here until we switch to a
   different module.
 
+* Converted a few bashisms to standard Bourne shell compatibility (RT #194).
+
 Extra tools
 -----------
 

diff --git a/debian/interchange.wrapper b/debian/interchange.wrapper
@@ -8,7 +8,7 @@ fi
 . /etc/interchange/init.cfg
 OPTS="SocketFile=/var/run/interchange/interchange.sock IPCsocket=/var/run/interchange/interchange.sock.ipc PIDfile=/var/run/interchange/interchange.pid --pidfile=/var/run/interchange/interchange.pid --log=/var/log/interchange/error.log --rundir=/var/run/interchange"
 CMD="env MINIVEND_STORABLE=$USE_STORABLE MINIVEND_FORCE_THREADS=1 /usr/lib/interchange/bin/interchange $OPTS $@"
-if [ "$UID" -eq 0 ]; then
+if [ "`/usr/bin/id -ru`" -eq 0 ]; then
 	su -s /bin/sh -c "$CMD" $USER
 else
 	$CMD

diff --git a/debian/makecat.wrapper b/debian/makecat.wrapper
@@ -4,7 +4,7 @@
 OPTS="--interchangeuser=$USER --linkprogram=/usr/lib/cgi-bin/ic/vlink --documentroot=$DOCROOT --catalogconf=/etc/interchange/catalogs.cfg --serverconf=/etc/apache2/apache2.conf"
 
 CMD="/usr/lib/interchange/bin/makecat $OPTS $@"
-if [ "$UID" -eq 0 ]; then
+if [ "`/usr/bin/id -ru`" -eq 0 ]; then
 	su -s /bin/sh -c "$CMD" $USER
 else
 	OPTS="$OPTS --nocfg --norunning"