Changeset 1190

Timestamp:

Dec 31, 2008, 4:24:44 PM (9 years ago)

Author:

jrollins

Message:

fixed some lingering bashism that were causing things to fail with
dash/sh.

Location:

trunk/cereal

Files:

• debian/changelog (modified) (1 diff)
• src/cereal (modified) (1 diff)
• src/cereal-admin (modified) (3 diffs)
• src/common (modified) (1 diff)

trunk/cereal/debian/changelog

@@ -4 +4 @@
   * new upstream packaging/build system.  all-inclusive makefile, and
     simplified debhelper rules.
-  
+  * fixed some bashisms that were causing things to fail with dash/sh.
+
   [ Daniel Kahn Gillmor ]
   * bumped debian/compat to reflect the use of debhelper 7.
   * changed maintainer address.
   
- -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Sun, 09 Nov 2008 22:15:13 -0500
+ -- Jameson Graef Rollins <jrollins@finestructure.net>  Wed, 31 Dec 2008 16:17:11 -0500
 
 cereal (0.23-2) unstable; urgency=low

trunk/cereal/src/cereal

@@ -14 +14 @@
 SHAREDIR=${SHAREDIR:-"/usr/share/cereal"}
 export SHAREDIR
-source "$SHAREDIR/common"
+. "$SHAREDIR/common"
 ##################################################
 

trunk/cereal/src/cereal-admin

@@ -44 +44 @@
 # create session
 create() {
-    if (( $# < 5 )) ; then
+    if [ $# -lt 5 ] ; then
         failure "Not enough input arguments.
 Type 'cereal-admin help' for more info."
@@ -240 +240 @@
         elif is_running "$SESSION" ; then
             echo "Session '$SESSION' is currently running."
-            read -p "Really stop and destroy session? [Y|n]: " OK; OK=${OK:=Y}
+            echo -n "Really stop and destroy session? [Y|n]: "
+            read OK; OK=${OK:=Y}
             if [ "$OK" = 'y' -o "$OK" = 'Y' ] ; then
                 if stop_session "$SESSION" ; then
@@ -255 +256 @@
             fi
         else
-            read -p "Really destroy session '$SESSION'? [Y|n]: " OK; OK=${OK:=Y}
+            echo -n "Really destroy session '$SESSION'? [Y|n]: "
+            read OK; OK=${OK:=Y}
             if [ "$OK" = 'y' -o "$OK" = 'Y' ] ; then
                 if destroy_session "$SESSION" ; then

trunk/cereal/src/common

@@ -145 +145 @@
 #log_write SESSION STATEMENT
 log_write() {
-    echo -e "\ncereal: $2" >> "$SESSIONDIR/$1/socket"
+    printf "\ncereal: $2\n" >> "$SESSIONDIR/$1/socket"
 }