Issue #58: aaaaaargh handling [ci skip]

GsDevKit · Mar 20, 2015 · 2473c9d · 2473c9d
1 parent f6cd911
commit 2473c9d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/bin/gs/startGemstone b/bin/gs/startGemstone
@@ -3,6 +3,10 @@
 # Copyright (c) 2014, 2015 GemTalk Systems, LLC <dhenrich@gemtalksystems.com>.
 #=========================================================================
 
+echo "================="
+echo "   GsDevKit GemStone script: $(basename $0)"
+echo "================="
+
 if [ -s $GEMSTONE/seaside/etc/gemstone.secret ]; then
       . $GEMSTONE/seaside/etc/gemstone.secret
 else

diff --git a/bin/gs/stopGemstone b/bin/gs/stopGemstone
@@ -3,6 +3,10 @@
 # Copyright (c) 2014, 2015 GemTalk Systems, LLC <dhenrich@gemtalksystems.com>.
 #=========================================================================
 
+echo "================="
+echo "   GsDevKit GemStone script: $(basename $0)"
+echo "================="
+
 if [ -s $GEMSTONE/seaside/etc/gemstone.secret ]; then
       . $GEMSTONE/seaside/etc/gemstone.secret
 else

diff --git a/bin/startStone b/bin/startStone
@@ -36,30 +36,30 @@ HELP
 
 set -e # exit on error
 waitTime=""
-ARGS=""
+ARG=""
 while getopts "hw:CNR" OPT ; do
   case "$OPT" in
     C) 
       if [ "${ARGS}x" != "x" ] ; then 
         echo "Only one of -C -N or -R options may be specified"
         exit 1
       fi
-      ARGS="${OPT}"
+      ARG="-C"
     ;;
     h) usage; exit 0 ;;
     N)
       if [ "${ARGS}x" != "x" ] ; then 
         echo "Only one of -C -N or -R options may be specified"
         exit 1
       fi
-      ARGS="${OPT}"
+      ARG="-N"
     ;;
     R)
       if [ "${ARGS}x" != "x" ] ; then 
         echo "Only one of -C -N or -R options may be specified"
         exit 1
       fi
-      ARGS="${OPT}"
+      ARG="-R"
     ;;
     w) waitTime="${OPTARG}" ;;
     *) usage; exit 1 ;;
@@ -82,7 +82,7 @@ source $stonePath/stone.env
 popd >& /dev/null
 
 # start the stone
-$GS_HOME/bin/gs/startGemstone $ARGS
+$GS_HOME/bin/gs/startGemstone $ARG
 
 if [ "${waitTime}x" = "x" ] ; then
   if [ "${GS_TRAVIS}x" != "x" ] ; then