switch to using gemstone and pharo as the default image names (instea…

…d of admin...)

bin/install.sh

@@ -55,14 +55,14 @@ popd
 curl  -L -O -s -S "https://github.com/dalehenrich/st_launcher/releases/download/$st_launcherVersion/st_launcher_default.env"
 curl  -L -O -s -S "https://github.com/dalehenrich/st_launcher/releases/download/$st_launcherVersion/st_launcher_home.ston"
 mv st_launcher_default.env st_launcher_home.ston $HOME/.config/st_launcher
-pushd home/images/admin_gs_350/snapshots
-	curl  -L -O -s -S "https://github.com/dalehenrich/st_launcher/releases/download/$st_launcherVersion/extent0.admin_gs_350.dbf.zip"
-	unzip -q  extent0.admin_gs_350.dbf.zip
+pushd home/images/gemstone/snapshots
+	curl  -L -O -s -S "https://github.com/dalehenrich/st_launcher/releases/download/$st_launcherVersion/extent0.gemstone.dbf.zip"
+	unzip -q  extent0.gemstone.dbf.zip
 popd
-pushd home/images/admin_pharo_70
-	curl -L -O -s -S "https://github.com/dalehenrich/st_launcher/releases/download/$st_launcherVersion/admin_pharo_70.zip"
-	unzip -q admin_pharo_70.zip
-	rm admin_pharo_70.zip
+pushd home/images/pharo
+	curl -L -O -s -S "https://github.com/dalehenrich/st_launcher/releases/download/$st_launcherVersion/pharo.zip"
+	unzip -q pharo.zip
+	rm pharo.zip
 popd
 sudo mkdir /usr/local/bin/smalltalk
 sudo mkdir /usr/local/bin/smalltalk/gemstone

home/images/admin_gs_350/imageProperties.ston → home/images/gemstone/imageProperties.ston

@@ -1,11 +1,11 @@
 StLauncherGemStoneSoloImageProperties {
 	#binPath : 'bin',
 	#gemstoneVersion : '3.5.0',
-	#imagePath : '$ST_LAUNCHER_HOME/images/admin_gs_350',
+	#imagePath : '$ST_LAUNCHER_HOME/images/gemstone',
 	#logsPath : 'logs',
-	#name : 'admin_gs_350',
+	#name : 'gemstone',
 	#productPath : '$ST_LAUNCHER_HOME/platforms/gemstone/products/GemStone64Bit3.5.0-x86_64.Linux',
 	#snapshotsPath : 'snapshots',
-	#soloSnapshot : '$ST_LAUNCHER_HOME/images/admin_gs_350/snapshots/extent0.admin_gs_350.dbf',
+	#soloSnapshot : '$ST_LAUNCHER_HOME/images/gemstone/snapshots/extent0.gemstone.dbf',
 	#structureName : 'st_launcher_home'
 }

home/images/pharo/Pharo7.0-32bit-0903ade.sources

@@ -0,0 +1 @@
+../../platforms/pharo/70-64/Pharo7.0-32bit-0903ade.sources

home/images/admin_pharo_70/imageProperties.ston → home/images/pharo/imageProperties.ston

@@ -1,7 +1,7 @@
 StLauncherPharoImageProperties {
-	#imagePath : '$ST_LAUNCHER_HOME/images/admin_pharo_70',
+	#imagePath : '$ST_LAUNCHER_HOME/images/pharo',
 	#pharoVersion : '70-64',
-	#name : 'admin_pharo_70',
+	#name : 'pharo',
 	#productPath : '$ST_LAUNCHER_HOME/platforms/pharo/70-64',
 	#structureName : 'st_launcher_home'
 }

home/images/pharo/pharo-vm

@@ -0,0 +1 @@
+../../platforms/pharo/70-64/pharo-vm

rowan/src/st_launcher-Properties/StLauncherImageProperties.class.st

@@ -35,7 +35,7 @@ StLauncherImageProperties class >> defaultPropertyFilename [
 { #category : 'accessing' }
 StLauncherImageProperties class >> permanentImageNames [
 
-	^#( 'admin_gs_350' 'admin_pharo_70')
+	^#( 'gemstone' 'pharo')
 ]
 
 { #category : 'accessing' }

travis_tests/st_launcher_pharo_tests.sh

@@ -6,14 +6,14 @@ fi
 
 testHello_explicitmage_pharo_1() {
 	# execute without error
-  result=`bin/hello.st admin_pharo_70 --`
+  result=`bin/hello.st pharo --`
 	status=$?
 	th_validateHello "testHello_exlicitImage" "$status" "$result"
 }
 
 testHello_invalidOption_pharo() {
 	# execute without error
-  result=`bin/hello.st admin_pharo_70 -- -x`
+  result=`bin/hello.st pharo -- -x`
 	status=$?
 	assertEquals "testHello_invalidOption: invalid option error" \
 	'1' "$status"

travis_tests/st_launcher_tests.sh

@@ -5,31 +5,31 @@ if [ -z ${ST_LAUNCHER_HOME+x} ]; then
 fi
 
 testTopaz_empty_args() {
-	result=`bin/test_args.tpz admin_gs_350 -- -lq --`
+	result=`bin/test_args.tpz gemstone -- -lq --`
 	assertEquals "testTopaz_empty_args" \
 		"EMPTY ARGS" "$result"
 }
 
 testTopaz_lone_arg1() {
-	result=`bin/test_args.tpz admin_gs_350 -- -lq -- LONE`
+	result=`bin/test_args.tpz gemstone -- -lq -- LONE`
 	assertEquals "testTopaz lone_arg1" \
 		"lonearg:LONE" "$result"
 }
 
 testTopaz_lone_arg2() {
-	result=`bin/test_args.tpz admin_gs_350 -- -lq -- L-ONE`
+	result=`bin/test_args.tpz gemstone -- -lq -- L-ONE`
 	assertEquals "testTopaz lone_arg2" \
 		"lonearg:L-ONE" "$result"
 }
 
 testTopaz_option() {
-	result=`bin/test_args.tpz admin_gs_350 -- -lq -- -l`
+	result=`bin/test_args.tpz gemstone -- -lq -- -l`
 	assertEquals "testTopaz option" \
 		"option:-l" "$result"
 }
 
 testTopaz_option_arg1() {
-	result=`bin/test_args.tpz admin_gs_350 -- -lq -- -l hello`
+	result=`bin/test_args.tpz gemstone -- -lq -- -l hello`
 	status=$?
 	assertEquals "testTopaz option_arg1" \
 		"option:-l:arg:hello" "$result"
@@ -38,14 +38,14 @@ testTopaz_option_arg1() {
 }
 
 testTopaz_option_arg2() {
-	result=`bin/test_args.tpz admin_gs_350 -- -lq -- -l he-llo`
+	result=`bin/test_args.tpz gemstone -- -lq -- -l he-llo`
 	assertEquals "testTopaz option_arg2" \
 		"option:-l:arg:he-llo" "$result"
 }
 
 testTopaz_error() {
 	file=`mktemp`
-	bin/test_args.tpz admin_gs_350 -- -lq -- -e > $file  << EOF
+	bin/test_args.tpz gemstone -- -lq -- -e > $file  << EOF
 exit
 EOF
 	status=$?
@@ -55,14 +55,14 @@ EOF
 
 testHello_explicitmage_pharo_1() {
 	# execute without error
-  result=`bin/hello.st admin_pharo_70 --`
+  result=`bin/hello.st pharo --`
 	status=$?
 	th_validateHello "testHello_exlicitImage_pharo_1" "$status" "$result"
 }
 
 testHello_explicitmage_gs_1() {
 	# execute without error
-  result=`bin/hello.st admin_gs_350 --`
+  result=`bin/hello.st gemstone --`
 	status=$?
 	th_validateHello "testHello_exlicitImage_gs_1" "$status" "$result"
 }