Issue #58: improve logic for checking whether todeClient image needs …

…to be built or not[ci skip]

bin/createStone

@@ -59,12 +59,13 @@ fi
 stoneName="$1"
 gsvers="$2"
 
-if [ ! -e "$GS_HOME/pharo/pharo" ]; then
-  $GS_HOME/bin/installPharo
+pharo=$GS_HOME/pharo
+
+if [ ! -e $pharo/todeClient.image ] ; then
+  $GS_HOME/bin/createTodeImage
 fi
 
 echo "Creating stone $stoneName"
-pharo=$GS_HOME/pharo
 $pharo/pharo $pharo/todeClient.image createStone $stoneName $gsvers
 
 $GS_HOME/bin/stoneExtent $noRestartArg $snapshotFileArg $stoneName

bin/createTodeImage

@@ -45,12 +45,17 @@ while getopts "hp:" OPT ; do
 done
 shift $(($OPTIND - 1))
 
+if [ ! -e "$GS_HOME/pharo/pharo" ]; then
+  $GS_HOME/bin/installPharo
+fi
+
 pharo=$GS_HOME/pharo
 if [ -e $pharo/todeClient${postFix}.image ] ; then
   echo "todeClient already installed"
   exit 0
 fi
 
+
 todeLoadPath=$GS_HOME/tode/sys/default/pharo/todeLoad.st
 if [ -e $GS_HOME/tode/sys/local/pharo/todeLoad.st ] ; then
   todeLoadPath=$GS_HOME/tode/sys/local/pharo/todeLoad.st

bin/stones

@@ -35,10 +35,11 @@ if [ $# -ne 0 ]; then
   usage; exit 1
 fi
 
-if [ ! -e "$GS_HOME/pharo/pharo" ]; then
-  $GS_HOME/bin/installPharo
+pharo=$GS_HOME/pharo
+
+if [ ! -e $pharo/todeClient.image ] ; then
+  $GS_HOME/bin/createTodeImage
 fi
 
 # Run script
-pharo=$GS_HOME/pharo
 $pharo/pharo $pharo/todeClient.image stones

bin/tode

@@ -43,11 +43,11 @@ if [ "${GS_HOME}x" = "x" ] ; then
 fi
 
 #set -e # exit on error
-if [ ! -e "$GS_HOME/pharo/pharo" ]; then
-  $GS_HOME/bin/installPharo
+pharo=$GS_HOME/pharo
+
+if [ ! -e $pharo/todeClient.image ] ; then
+  $GS_HOME/bin/createTodeImage
 fi
 
 # Run script
-pharo=$GS_HOME/pharo
-#unset GEMSTONE_NRS_ALL
 $pharo/pharo $pharo/todeClient.image $*

bin/todeClient

@@ -9,15 +9,18 @@ echo "================="
 
 usage() {
   cat <<HELP
-USAGE: $(basename $0) [-h] [-p <postfix>]
+USAGE: $(basename $0) [-h] [-c] [-p <postfix>]
 
 Launch todeClient image.
 
 OPTIONS
   -h 
      display help
+  -c
+     Clean and rebuild the todeClient image
   -p <postfix>
-     Launch the tode client image created with a matching 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
@@ -28,8 +31,10 @@ HELP
 }
 
 postFix=""
+cleanImage=""
 while getopts "hp:" OPT ; do
   case "$OPT" in
+    c) cleanImage="clean";;
     h) usage; exit 0 ;;
     p) postFix="${OPTARG}" ;;
     *) usage; exit 1 ;;
@@ -43,8 +48,16 @@ if [ "${GS_HOME}x" = "x" ] ; then
 fi
 
 set -e # exit on error
-if [ ! -e "$GS_HOME/pharo/pharo" ]; then
-  $GS_HOME/bin/installPharo
+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
+fi
+
+if [ ! -e $pharo/todeClient${postFix}.image ] ; then
+  $GS_HOME/bin/createTodeImage -p ${postFix}
 fi
 
 pharo=$GS_HOME/pharo

bin/updateTodeImage

@@ -50,8 +50,12 @@ fi
 
 echo "updating todeClient${postFix} image using $todeLoadPath"
 
-
 pharo=$GS_HOME/pharo
+
+if [ ! -e $pharo/todeClient${postFix}.image ] ; then
+  $GS_HOME/bin/createTodeImage -p ${postFix}
+fi
+
 $pharo/pharo $pharo/todeClient${postFix}.image save todeClientTmp
 
 $pharo/pharo $pharo/todeClientTmp.image st --quit --save $todeLoadPath