Issue #265: convert .tpz script invocations into topaz here documents

GsDevKit · Nov 8, 2019 · f01af7f · f01af7f
1 parent 6b867a7
commit f01af7f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/...evKit_launcher/bootstrapping/gemstone/gsdevkit_home/newBuild_SystemUser_gsdevkit_launcher b/...evKit_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
diff --git a/...ncher/bootstrapping/gemstone/gsdevkit_home/newBuild_SystemUser_gsdevkit_launcher_deployer b/...ncher/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
 
diff --git a/..._launcher/bootstrapping/gemstone/gsdevkit_home/newBuild_SystemUser_gsdevkit_launcher_tode b/..._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