Merge pull request #269 from GsDevKit/issue_265

merge work on #265 and #268

Author: dalehenrich

alt_bin/examples/error.st

@@ -1 +1 @@
-../../shared/repos/GsDevKit_launcher/rowan/tonel/gsdevkit_launcher-Scripts/GdkL_Error.class.st
+..//../shared/repos/GsDevKit_launcher/rowan/tonel/gsdevkit_launcher-Scripts/GdkL_Error.class.st

alt_bin/examples/hello.st

@@ -1 +1 @@
-../../shared/repos/GsDevKit_launcher/rowan/tonel/gsdevkit_launcher-Scripts/GdkL_Hello.class.st
+..//../shared/repos/GsDevKit_launcher/rowan/tonel/gsdevkit_launcher-Scripts/GdkL_Hello.class.st

alt_bin/gsdevkit_launcher

@@ -32,7 +32,6 @@ EXAMPLES
 
 HELP
 }
-source "${GS_HOME}/bin/private/shFunctions"
 stashFile=`realpath $1`
 scriptName="$(basename -- $1)"
 shift
@@ -197,3 +196,72 @@ _canonicalize_file_path() {
     (cd "$dir" 2>/dev/null && printf '%s/%s\n' "$(pwd -P)" "$file")
 }
 
+# https://github.com/mkropat/sh-realpath/blob/master/realpath.sh
+realpath() {
+    canonicalize_path "$(resolve_symlinks "$1")"
+}
+
+resolve_symlinks() {
+    _resolve_symlinks "$1"
+}
+
+_resolve_symlinks() {
+    _assert_no_path_cycles "$@" || return
+
+    local dir_context path
+    path=$(readlink -- "$1")
+    if [ $? -eq 0 ]; then
+        dir_context=$(dirname -- "$1")
+        _resolve_symlinks "$(_prepend_dir_context_if_necessary "$dir_context" "$path")" "$@"
+    else
+        printf '%s\n' "$1"
+    fi
+}
+
+_prepend_dir_context_if_necessary() {
+    if [ "$1" = . ]; then
+        printf '%s\n' "$2"
+    else
+        _prepend_path_if_relative "$1" "$2"
+    fi
+}
+
+_prepend_path_if_relative() {
+    case "$2" in
+        /* ) printf '%s\n' "$2" ;;
+         * ) printf '%s\n' "$1/$2" ;;
+    esac
+}
+
+_assert_no_path_cycles() {
+    local target path
+
+    target=$1
+    shift
+
+    for path in "$@"; do
+        if [ "$path" = "$target" ]; then
+            return 1
+        fi
+    done
+}
+
+canonicalize_path() {
+    if [ -d "$1" ]; then
+        _canonicalize_dir_path "$1"
+    else
+        _canonicalize_file_path "$1"
+    fi
+}
+
+_canonicalize_dir_path() {
+    (cd "$1" 2>/dev/null && pwd -P)
+}
+
+_canonicalize_file_path() {
+    local dir file
+    dir=$(dirname -- "$1")
+    file=$(basename -- "$1")
+    (cd "$dir" 2>/dev/null && printf '%s/%s\n' "$(pwd -P)" "$file")
+}
+

shared/repos/GsDevKit_launcher/README.md

@@ -45,16 +45,18 @@ updateGsDevKit -gdtcs       # SKIP this if you have a fresh GsDevKit_home instal
 git checkout issue_260
 git pull origin issue_260	# make sure you have latest commit in your checkout
 
-# bootstrap gsdevkit_launcher script support
-$GS_HOME/alt_bin/bootstrap_launcher
-
 # add alt_bin and alt_bin/examples to your path
 . alt_bin/defHOME_PATH.env
 
+# bootstrap gsdevkit_launcher script support
+$GS_HOME/alt_bin/bootstrap_launcher
+
 # test out the example scripts
 hello.st
+hello.st --help
 error.st
 error.st -D --
+error.st -h
 ```
 #### tODE development image
 The `bootstrap_launcher` script creates a tODE image, that is ready for developing gsdevkit scripts:

shared/repos/GsDevKit_launcher/bootstrapping/gemstone/gsdevkit_home/newBuild_SystemUser_gsdevkit_launcher

@@ -5,5 +5,8 @@ rm -rf *.log *.out
 
 newExtent -t -s snapshots/extent0.tode.dbf $GEMSTONE_NAME
 
-$ROWAN_PROJECTS_HOME/GsDevKit_launcher/bootstrapping/gemstone/bin/bootstrap_install.tpz $GEMSTONE_NAME -lq
+startTopaz $GEMSTONE_NAME -l << EOF
 
+	input $ROWAN_PROJECTS_HOME/GsDevKit_launcher/bootstrapping/gemstone/bin/bootstrap_install.tpz
+
+EOF

shared/repos/GsDevKit_launcher/bootstrapping/gemstone/gsdevkit_home/newBuild_SystemUser_gsdevkit_launcher_deployer

@@ -12,7 +12,11 @@ else
 	todeLoad $GEMSTONE_NAME
 fi
 
-$ROWAN_PROJECTS_HOME/GsDevKit_launcher/bootstrapping/gemstone/bin/bootstrap_install_tode.tpz $GEMSTONE_NAME -lq
+startTopaz $GEMSTONE_NAME -l << EOF
+
+	input $ROWAN_PROJECTS_HOME/GsDevKit_launcher/bootstrapping/gemstone/bin/bootstrap_install_tode.tpz
+
+EOF
 
 #	this script needs to be rewritten for gsdevkit_launcher
 rm -f snapshots/extent0.gsdevkit_launcher.dbf
@@ -28,7 +32,11 @@ pushd $GS_HOME/shared/gemstone/snapshots/
 popd
 startStone $GEMSTONE_NAME	# in 3.5.1 snapshot up above
 
-$ROWAN_PROJECTS_HOME/GsDevKit_launcher/bootstrapping/gemstone/bin/bootstrap_install_scripts.tpz $GEMSTONE_NAME -lq
+startTopaz $GEMSTONE_NAME -l << EOF
+
+	input $ROWAN_PROJECTS_HOME/GsDevKit_launcher/bootstrapping/gemstone/bin/bootstrap_install_scripts.tpz $GEMSTONE_NAME -lq
+
+EOF
 
 todeIt $GEMSTONE_NAME mount @/sys/stone/dirs/GsDevKit_launcher/shared/repos/GsDevKit_launcher/tode /home gsdevkit_launcher
 

shared/repos/GsDevKit_launcher/bootstrapping/gemstone/gsdevkit_home/newBuild_SystemUser_gsdevkit_launcher_tode

@@ -7,7 +7,15 @@ rm -rf *.log *.out
 newExtent $GEMSTONE_NAME
 todeLoad $GEMSTONE_NAME
 
-$ROWAN_PROJECTS_HOME/GsDevKit_launcher/bootstrapping/gemstone/bin/bootstrap_install_tode.tpz $GEMSTONE_NAME -lq
-$ROWAN_PROJECTS_HOME/GsDevKit_launcher/bootstrapping/gemstone/bin/bootstrap_install_scripts.tpz $GEMSTONE_NAME -lq
+startTopaz $GEMSTONE_NAME -l << EOF
+
+	input $ROWAN_PROJECTS_HOME/GsDevKit_launcher/bootstrapping/gemstone/bin/bootstrap_install_tode.tpz
+EOF
+
+startTopaz $GEMSTONE_NAME -l << EOF
+
+	input $ROWAN_PROJECTS_HOME/GsDevKit_launcher/bootstrapping/gemstone/bin/bootstrap_install_scripts.tpz
+
+EOF
 
 todeIt $GEMSTONE_NAME mount @/sys/stone/dirs/GsDevKit_launcher/shared/repos/GsDevKit_launcher/tode /home gsdevkit_launcher