Issue #4: registerProductDirectory.solo, downloadGemStone.solo, regis…

…terProduct.solo tested and validated
GsDevKit · May 30, 2023 · 73a7057 · 73a7057
1 parent bdc1d1f
commit 73a7057
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -10,23 +10,24 @@ After running install add superDoit/bin and GsDevKit_stones/bin to $PATH
 
 ## Setting up the registry structure
 ```bash
-registryName="issue_4"
+registryName="gsdevkit"
 projectSetName="gsdevkit"
-gemstoneProductsDirectory=""
-projectsDirectory="/bosch1/users/dhenrich/_git/"
+gemstoneProductsDirectory="/bosch1/users/dhenrich/products"
+projectsDirectory="/bosch1/users/dhenrich/projects/"
 
 createRegistry.solo $registryName
 createProjectSet.solo --registry=$registryName --projectSet=$projectSetName --ssh
+createProjectSet.solo --registry=$registryName --projectSet=${projectSetName}_https --https
 cloneProjectsFromProjectSet.solo --registry=$registryName --projectSet=$projectSetName \
   --projectDirectory=$projectsDirectory
-registerProductDirectory.solo --registry=$registryName --productDirectory=$projectsDirectory
+registerProductDirectory.solo --registry=$registryName --productDirectory=$gemstoneProductsDirectory
 
 # GemStone version not previously downloaded
-downloadGemStone.solo --directory=$gemstoneProductsDirectory --registry=$registryName 3.6.6
-# GemStone version previously downloaded
-registerProduct.solo --registry=$registryName --fromDirectory=$GS_HOME/shared/downloads/products 3.6.6
-# internal development
-registerProduct.solo --registry=$registryName --fromDirectory=/bosch1/users/dhenrich/_work/d_37x/noop50/gs/product 3.7.0
+downloadGemStone.solo --registry=$registryName 3.6.6
+# Register full set of previously downloaded product trees
+registerProduct.solo --registry=$registryName --fromDirectory=$GS_HOME/shared/downloads/products
+# register named GemStone version using path to product tree
+registerProduct.solo --registry=$registryName --productPath=/bosch1/users/dhenrich/_work/d_37x/noop50/gs/product 3.7.0
 
 registryReport.solo
 ```

diff --git a/bin/registerProduct.solo b/bin/registerProduct.solo
@@ -74,16 +74,16 @@ doit
 		ifNotNil: [:productPath |
 			gemstonePath := GsFile serverRealPath: self productPath.
 			gemstoneVersion := self positionalArgs at: 1.
-		(stonesRegistry products at: gemstoneVersion ifAbsent: [])
-			ifNotNil: [:existingPath | 
-				self force 
-					ifFalse: [ 
-						self error: 'There is an existing path (', 
-							existingPath,
-							') for the GemStone version ', 
-							gemstoneVersion, 
-							'. Use the --force option to override.' ].
-				self register: gemstoneVersion path: gemstonePath for: stonesRegistry ] ]
+			(stonesRegistry products at: gemstoneVersion ifAbsent: [])
+				ifNotNil: [:existingPath | 
+					self force 
+						ifFalse: [ 
+							self error: 'There is an existing path (', 
+								existingPath,
+								') for the GemStone version ', 
+								gemstoneVersion, 
+								'. Use the --force option to override.' ] ].
+			self register: gemstoneVersion path: gemstonePath for: stonesRegistry ]
 		ifNil: [
 			self fromDirectory
 				ifNotNil: [:directory |