Issue #4: clean things up so createStone and deleteStone do the right…

… things

bin/createStone.solo

@@ -142,20 +142,11 @@ doit
 		yourself.
 	(stoneSpec registryFile exists or: [stoneSpec rootDir exists])
 		ifTrue: [ 
-			(stoneSpec rootDir exists)
-				ifTrue: [ 
-					self force
-						ifFalse: [ 
-							self error: 
-								'A stone is already present at ', 
-								stoneSpec rootDir pathString printString, 
-								'. Use --force to clean up.'].
-					stoneSpec destroyStoneStructure ]
+			self force
 				ifFalse: [ 
 					self error: 
-						'A stone with the name ', 
-						stoneName printString, 
-						' already exists. Not yet implemented' ] ].
+						'A stone named ', stoneName, ' already exists. Use --force to clean up.'].
+			stoneSpec destroyStoneStructure ].
 	stoneSpec createStoneStructureUsing: stonesRegistry.
 	stoneSpec registryDir ensureCreateDirectory.
 	stoneSpec export.

bin/deleteStone.solo

@@ -83,7 +83,9 @@ doit
 	self positionalArgs size ~= 1
 		ifTrue: [ self error: 'Expected a positional argument: <stone-name>' ].
 	stoneName := self positionalArgs at: 1.
-	stoneSpec := stonesRegistry stoneNamed: stoneName.
+	stoneSpec := stonesRegistry 
+		stoneNamed: stoneName 
+		ifAbsent: [ self error: 'The stone ', stoneName printString, ' does not exist' ].
 	stonesRegistry destroyStoneStructureFor: stoneName.
 	^ self noResult
 %

bin/validateStoneSysNodes.stone

@@ -121,5 +121,5 @@ doit
 	      value: stoneRootDir
 	      value: 'repos.ston'
 	      value: 'repos' ].
-	^ self noResult
+	^ System commit
 %

src/GsDevKit_stones-Core.package/GDKStoneSpec.class/instance/destroyStoneStructure.st

@@ -4,13 +4,18 @@ destroyStoneStructure
 
 	"shut down stone BEFORE calling"
 
+	[ 
 	(self waitStone: 1) ~= 3
 		ifTrue: [ 
 			self
 				error:
 					'The stone ' , self stoneName
 						,
-							' is still running. It must be stopped BEFORE destroying the stone structure' ].
+							' is still running. It must be stopped BEFORE destroying the stone structure' ] ]
+		on: Error
+		do: [ :ignored | 
+			"ignore errors during waitstone"
+			 ].
 	self rootDir exists
 		ifTrue: [ self rootDir ensureDeleteAll ].
 	self registryFile exists

src/GsDevKit_stones-Core.package/GDKStonesRegistry.class/instance/destroyStoneStructureFor..st

@@ -2,6 +2,7 @@ stone management
 destroyStoneStructureFor: stoneName
 	| stoneSpec status |
 	stoneSpec := self stoneNamed: stoneName.
+	[ 
 	(stoneSpec waitStone: 1) = 0
 		ifTrue: [ 
 			| count |
@@ -14,8 +15,16 @@ destroyStoneStructureFor: stoneName
 					count := count + 1.
 					count > 2
 						ifTrue: [ self error: 'Cannot stop stone' ].
-					Delay waitForSeconds: 1 ] ].
-	stoneSpec stopNetldi.
+					Delay waitForSeconds: 1 ] ] ]
+		on: Error
+		do: [ :ignored | 
+			"ignore errors during waitstone/stopstone"
+			 ].
+	[ stoneSpec stopNetldi ]
+		on: Error
+		do: [ :ignored | 
+			"ignore errors during stopNetldi"
+			 ].
 	stoneSpec destroyStoneStructure.
 	self stones removeKey: stoneName.
 	self export

src/GsDevKit_stones-Core.package/GDKStonesRegistry.class/instance/todeHomeDirectory.templatesDir.populate..st

@@ -14,7 +14,13 @@ todeHomeDirectory: todeHomePath templatesDir: sourceTemplatesDir populate: popul
 			(todeHomeDir / 'sys' / 'default' / 'server') ensureCreateDirectory.
 			(todeHomeDir / 'sys' / 'default' / 'server' / 'gemstone')
 				ensureCreateDirectory.
+
 			(todeHomeDir / 'sys' / 'default' / 'server' / 'home') ensureCreateDirectory.
+			(todeHomeDir / 'sys' / 'default' / 'server' / 'home' / 'tode') ensureCreateDirectory.
+"copy GsDevKit_stones/todeHome/tode"
+			(todeHomeDir / 'sys' / 'default' / 'server' / 'home' / 'utils' ) ensureCreateDirectory.
+"copy GsDevKit_stones/todeHome/utils"
+
 			(todeHomeDir / 'sys' / 'default' / 'server' / 'projects')
 				ensureCreateDirectory.
 			(todeHomeDir / 'sys' / 'default' / 'server' / 'stones') ensureCreateDirectory.

src/GsDevKit_stones-Tode.package/TDShell.class/instance/shellId.st

@@ -1,4 +1,4 @@
 stash
 shellId
-	shellId ifNil: [ shellId := 1 ].
+	shellId ifNil: [ shellId := 0 ].
 	^ shellId