[interchange-cvs] interchange - jon modified 3 files

[interchange-cvs at icdevgroup.org]

User:      jon
Date:      2008-05-13 23:18:44 GMT
Modified:  .        WHATSNEW-5.5
Modified:  debian   interchange.wrapper makecat.wrapper
Log:
Convert some bash-specific syntax to standard Bourne shell (RT #194).

Revision  Changes    Path
1.119                interchange/WHATSNEW-5.5


rev 1.119, prev_rev 1.118
Index: WHATSNEW-5.5
===================================================================
RCS file: /var/cvs/interchange/WHATSNEW-5.5,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -u -r1.118 -r1.119
--- WHATSNEW-5.5	13 May 2008 22:49:28 -0000	1.118
+++ WHATSNEW-5.5	13 May 2008 23:18:44 -0000	1.119
@@ -150,6 +150,8 @@
   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
 -----------
 



2.4                  interchange/debian/interchange.wrapper


rev 2.4, prev_rev 2.3
Index: interchange.wrapper
===================================================================
RCS file: /var/cvs/interchange/debian/interchange.wrapper,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -u -r2.3 -r2.4
--- interchange.wrapper	6 Jul 2003 17:46:45 -0000	2.3
+++ interchange.wrapper	13 May 2008 23:18:44 -0000	2.4
@@ -8,7 +8,7 @@
 . /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



2.4                  interchange/debian/makecat.wrapper


rev 2.4, prev_rev 2.3
Index: makecat.wrapper
===================================================================
RCS file: /var/cvs/interchange/debian/makecat.wrapper,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -u -r2.3 -r2.4
--- makecat.wrapper	2 Jan 2008 09:21:49 -0000	2.3
+++ makecat.wrapper	13 May 2008 23:18:44 -0000	2.4
@@ -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"