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