Issue #58: add -f option to createStone, createTodeImage, installServer, and todeClient scripts

-f option forces creation of new stone (stop stone and netldi, then
delete directory) and new tode image (install fresh image).
updateTodeImage script removed (createTodeImage -f and todeClient -f
replaces it).
[ci skip]

Author: dalehenrich

Diff for: bin/README.md

@@ -50,7 +50,6 @@ Scripts that can be run on the client machine or the server.
 |[pharo][21]| Run headless pharo scripts using the Pharo image.|
 |[tode][22]| Run headless tode scripts using the todeClient image.|
 |[todeClient][15]| Launch todeClient image. Requires X11 client.|
-|[updateTodeImage][16]| Update the tODE client image.|
 
 ##Utility Scripts
 Special purpose utility scripts.
@@ -74,7 +73,7 @@ Special purpose utility scripts.
 [13]: stopStone
 [14]: createTodeImage
 [15]: todeClient
-[16]: updateTodeImage
+
 [17]: installGci
 [18]: installGemStone
 [19]: installPharo

Diff for: bin/createStone

@@ -9,7 +9,7 @@ echo "================="
 
 usage() {
   cat <<HELP
-USAGE: $(basename $0) [-h] [-n] [-s <snapshot-file-path>] <stone-name> <gemstone-version>
+USAGE: $(basename $0) [-h] [-f] [-n] [-s <snapshot-file-path>] <stone-name> <gemstone-version>
 
 Create a new stone with the given stone name. Do not install tODE. Start stone
 and netldi unless -n is specified.
@@ -23,6 +23,9 @@ option to start the stone, the first time.
 OPTIONS
   -h
      display help
+  -f
+     Force creation of new stone, by deleting 
+     $GS_HOME/gemstone/stone/<stone-name> directory if it exists
   -n
      No startStone, no startNetldi.
   -s <snapshot-file-path> 
@@ -31,6 +34,7 @@ OPTIONS
 EXAMPLES
   $(basename $0) -h
   $(basename $0) kit 3.2.1
+  $(basename $0) -f kit 3.2.1
   $(basename $0) -s $GS_HOME/gemstone/snapshots/extent0.tode.3.2.4.dbf kit 3.2.4
 
 HELP
@@ -43,10 +47,11 @@ fi
 
 snapshotFileArg=""
 noRestartArg=""
+force=""
 while getopts "hns:" OPT ; do
   case "$OPT" in
     h) usage; exit 0;;
-    n) noRestartArg=" -n ";;
+    f) force="true";lient 
     s) snapshotFileArg=" -s ${OPTARG} ";;
     *) usage; exit 1;;
   esac
@@ -65,6 +70,17 @@ if [ ! -e $pharo/todeClient.image ] ; then
   $GS_HOME/bin/createTodeImage
 fi
 
+if [ -d $GS_HOME/gemstone/stones/$stoneName ] ; then
+  if [ "${force}x" = "x" ] ; then
+    echo "stone $stoneName already exists. Use the -f option to force re-creation"
+    exit 0 
+  else
+    echo "deleting old instance of stone $stoneName (stopping stone and netldi first)"
+    $GS_HOME/bin/stopStone -b $stoneName
+    rm -rf $GS_HOME/gemstone/stones/$stoneName
+  fi
+fi
+
 echo "Creating stone $stoneName"
 $pharo/pharo $pharo/todeClient.image createStone $stoneName $gsvers
 

Diff for: bin/createTodeImage

@@ -9,21 +9,28 @@ echo "================="
 
 usage() {
   cat <<HELP
-USAGE: $(basename $0) [-h] [-p <postfix]
+USAGE: $(basename $0) [-h] [-f] [-p <postfix]
 
 Create the tODE client image. Used for running pharo-based scripts
 and for running the tODE client UI.
 
+If the tODE client image already exists, the installation is skipped
+unless the -f option is specified.
+
 OPTIONS
   -h 
      display help
+  -f
+     Force tODE client installation, whether or not the image
+     already exists.
   -p <postfix>
      Append <postfix> to end of image name. Useful for creating
      multiple tode client images.
 
 EXAMPLES
   $(basename $0) -h
   $(basename $0) -p _0
+  $(basename $0) -f
   $(basename $0)
 
 HELP
@@ -36,9 +43,11 @@ if [ "${GS_HOME}x" = "x" ] ; then
 fi
 
 postFix=""
-while getopts ":hp:" OPT ; do
+force=""
+while getopts ":fhp:" OPT ; do
   case "$OPT" in
     h) usage; exit 0;;
+    f) force="true";;
     p) postFix="${OPTARG}";;
     ?) postFix="";;          # handle optional -p argument "
     *) usage; exit 1;;
@@ -50,10 +59,14 @@ if [ ! -e "$GS_HOME/pharo/pharo" ]; then
   $GS_HOME/bin/installPharo
 fi
 
-pharo=$GS_HOME/pharo
+message="create"
 if [ -e $pharo/todeClient${postFix}.image ] ; then
-  echo "todeClient already installed"
-  exit 0
+  if [ "${force}x" = "x" ] ; then
+    echo "todeClient already created, use -f to update"
+    exit 0
+  else
+    message="update"
+  fi
 fi
 
 
@@ -62,14 +75,15 @@ if [ -e $GS_HOME/tode/sys/local/pharo/todeLoad.st ] ; then
   todeLoadPath=$GS_HOME/tode/sys/local/pharo/todeLoad.st
 fi
 
-echo "creating todeClient${postFix} image using $todeLoadPath"
+echo "${message} todeClient${postFix} image using $todeLoadPath"
 
+pharo=$GS_HOME/pharo
 $pharo/pharo $pharo/Pharo.image save todeClientTmp
 
 $pharo/pharo $pharo/todeClientTmp.image st --quit --save $todeLoadPath
 
 $pharo/pharo $pharo/todeClientTmp.image save todeClient${postFix}
 
-rm -f todeClientTmp.*
+rm -f $pharo/todeClientTmp.*
 echo
-echo "tODEClient${postFix} image creation complete"
+echo "tODEClient${postFix} image ${message} complete"

Diff for: bin/installServer

@@ -9,19 +9,30 @@ echo "================="
 
 usage() {
   cat <<HELP
-USAGE: $(basename $0) [-h] <stone-name> <gemstone-version>
+USAGE: $(basename $0) [-h] [-f] <stone-name> <gemstone-version>
 
 Install GemStone/S, create a stone, start the stone, create a todeClient
 image. Runs the installGemstone, createTodeImage, createStone,
 startStone, startNetldi, startStatmonitor, installTodeStone and
 todeClient scripts.
 
+If a stone named $stoneName exists, the existing directory will be left
+alone unless the -f option is specified in which case the existing
+stone directory is deleted.
+
+If a todeClient image exists, the creation of a new image will be skipped
+unless the -f option is specified in which case the todeClient image is
+re-created.
+
 OPTIONS
   -h display help
+  -f force creation of stone and tode image
 
 EXAMPLES
    $(basename $0) -h
    $(basename $0) kit 3.2.1
+   $(basename $0) kit 3.2.1
+   $(basename $0) -f kit 3.2.1
 
 HELP
 }
@@ -30,8 +41,16 @@ set -e # exit on error
 if [ "${GS_HOME}x" = "x" ] ; then
   echo "the GS_HOME environment variable needs to be defined"; exit 1
 fi
-source ${GS_HOME}/bin/shFunctions
-getOpts_help $@
+
+forceArg=""
+while getopts "fhns:" OPT ; do
+  case "$OPT" in
+    h) usage; exit 0;;
+    f) forceArg="-f";;
+    *) usage; exit 1;;
+  esac
+done
+shift $(($OPTIND - 1))
 
 if [ $# -ne 2 ]; then
   usage; exit 1
@@ -41,9 +60,9 @@ gsvers="$2"
 
 $GS_HOME/bin/installGemStone $gsvers
 
-$GS_HOME/bin/createTodeImage
+$GS_HOME/bin/createTodeImage $forceArg
 
-$GS_HOME/bin/createStone $stoneName $gsvers
+$GS_HOME/bin/createStone $forceArg $stoneName $gsvers
 
 if [ "${GS_TRAVIS}x" = "x" ] ; then
   $GS_HOME/bin/startStatmonitor $stoneName

Diff for: bin/todeClient

@@ -10,32 +10,33 @@ echo "================="
 
 usage() {
   cat <<HELP
-USAGE: $(basename $0) [-h] [-c] [-p <postfix>]
+USAGE: $(basename $0) [-h] [-f] [-p <postfix>]
 
 Launch todeClient image.
 
 OPTIONS
   -h 
      display help
-  -c
-     Clean and rebuild the todeClient image
+  -f
+     Rebuild the todeClient image
   -p <postfix>
      Launch the tode client image created with a matching postfix. If
      the tode client image does not exist, build it.
 
 EXAMPLES
   $(basename $0) -h
+  $(basename $0) -f
   $(basename $0)
   $(basename $0) -p _0  # Launches the image named todeClient_0.image
 
 HELP
 }
 
 postFix=""
-cleanImage=""
-while getopts "hp:" OPT ; do
+force=""
+while getopts "fhp:" OPT ; do
   case "$OPT" in
-    c) cleanImage="clean";;
+    c) force="true";;
     h) usage; exit 0 ;;
     p) postFix="${OPTARG}" ;;
     *) usage; exit 1 ;;
@@ -51,10 +52,8 @@ fi
 set -e # exit on error
 pharo=$GS_HOME/pharo
 
-if [ -e $pharo/todeClient${postFix}.image ] ; then
-  if [ "$cleanImage" = "clean" ] ; then
-    rm $pharo/todeClient${postFix}.image $pharo/todeClient${postFix}.changes
-  fi
+if [ "$force" = "true" ] ; then
+ $GS_HOME/bin/createTodeImage -f -p ${postFix}
 fi
 
 if [ ! -e $pharo/todeClient${postFix}.image ] ; then