Changeset 1190


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/cereal/debian/changelog

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

    r1173 r1190  
    1414SHAREDIR=${SHAREDIR:-"/usr/share/cereal"}
    1515export SHAREDIR
    16 source "$SHAREDIR/common"
     16. "$SHAREDIR/common"
    1717##################################################
    1818
  • trunk/cereal/src/cereal-admin

    r1173 r1190  
    4444# create session
    4545create() {
    46     if (( $# < 5 )) ; then
     46    if [ $# -lt 5 ] ; then
    4747        failure "Not enough input arguments.
    4848Type 'cereal-admin help' for more info."
     
    240240        elif is_running "$SESSION" ; then
    241241            echo "Session '$SESSION' is currently running."
    242             read -p "Really stop and destroy session? [Y|n]: " OK; OK=${OK:=Y}
     242            echo -n "Really stop and destroy session? [Y|n]: "
     243            read OK; OK=${OK:=Y}
    243244            if [ "$OK" = 'y' -o "$OK" = 'Y' ] ; then
    244245                if stop_session "$SESSION" ; then
     
    255256            fi
    256257        else
    257             read -p "Really destroy session '$SESSION'? [Y|n]: " OK; OK=${OK:=Y}
     258            echo -n "Really destroy session '$SESSION'? [Y|n]: "
     259            read OK; OK=${OK:=Y}
    258260            if [ "$OK" = 'y' -o "$OK" = 'Y' ] ; then
    259261                if destroy_session "$SESSION" ; then
  • trunk/cereal/src/common

    r1173 r1190  
    145145#log_write SESSION STATEMENT
    146146log_write() {
    147     echo -e "\ncereal: $2" >> "$SESSIONDIR/$1/socket"
     147    printf "\ncereal: $2\n" >> "$SESSIONDIR/$1/socket"
    148148}
    149149
Note: See TracChangeset for help on using the changeset viewer.