Issue #58: clean up prompt logic in todeClient ... also handle option…

… arg to -p [ci skip]
GsDevKit · Mar 24, 2015 · 211fc9b · 211fc9b
1 parent 34251c6
commit 211fc9b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/bin/createTodeImage b/bin/createTodeImage
@@ -36,10 +36,11 @@ if [ "${GS_HOME}x" = "x" ] ; then
 fi
 
 postFix=""
-while getopts "hp:" OPT ; do
+while getopts ":hp:" OPT ; do
   case "$OPT" in
     h) usage; exit 0;;
     p) postFix="${OPTARG}";;
+    ?) postFix="";;          # handle optional -p argument "
     *) usage; exit 1;;
   esac
 done

diff --git a/bin/todeClient b/bin/todeClient
@@ -59,10 +59,11 @@ fi
 
 if [ ! -e $pharo/todeClient${postFix}.image ] ; then
   echo "The requested todeClient image: $pharo/todeClient${postFix}.image does not exist"
-  while true; do
-    read -p "Do you wish to create todeClient${postFix}?" yn
+  created="false"
+  while [ "$created" = "false" ] ; do
+    read -p "Do you wish to create todeClient${postFix}? [y/n]" yn
     case $yn in
-      [Yy]* ) $GS_HOME/bin/createTodeImage -p ${postFix};;
+      [Yy]* ) $GS_HOME/bin/createTodeImage -p ${postFix}; created="true" ;;
       [Nn]* ) exit 1;;
       * ) echo "Please answer yes or no.";;
     esac