@@ -1,11 +1,13 @@ #! /bin/bash if [ "$(uname -s)" != 'Darwin' ]; then buildid="$(( hostname; id -u; pwd ) | openssl sha1 | sed 's@^.*= *@@')" workdir="/tmp/work-kitcreator-${buildid}" - rsync -aq --delete -e ssh . powermacg5.vpn.oc9.org:${workdir}/ + + rsync -aq --delete -e ssh . powermacg5.vpn.oc9.org:${workdir}/ || exit 1 + ( newArgv=("$@"); declare -p newArgv declare -p workdir export cat << \_EOF_ @@ -12,12 +14,14 @@ cd "${workdir}" || exit 1 export PATH="${PATH}:/usr/local/bin:/usr/bin" ./kitcreator "${newArgv[@]}" exit "$?" _EOF_ - ) | ssh powermacg5.vpn.oc9.org bash -s || exit "$?" + ) | ssh powermacg5.vpn.oc9.org bash -s + retval="$?" + rm -f */build.log ssh powermacg5.vpn.oc9.org "workdir='${workdir}'; "'cd "${workdir}" && tar -cf - tclkit-* libtclkit* */build.log 2>/dev/null' | tar -xf - # Clean-up if appropriate case "$(pwd)" in /home/rkeene/*) @@ -24,7 +28,12 @@ ;; *) ssh powermacg5.vpn.oc9.org "workdir='${workdir}'; "'rm -rf "${workdir}"' ;; esac + + exit "${retval}" +else + exec ./kitcreator "$@" fi +exit 1