Launch from CLI working directory

With GUI, launch from image directory (rather than filesystem root). Fixes pharo-project#559
cdlm · May 12, 2022 · dc10478 · dc10478
1 parent 98c2030
commit dc10478
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/src/PharoLauncher-CLI/PhLImageLaunchCliCommand.class.st b/src/PharoLauncher-CLI/PhLImageLaunchCliCommand.class.st
@@ -80,7 +80,7 @@ PhLImageLaunchCliCommand >> executeWithImage: anImage [
 						nextPutAll: 'Architecture mismatch, still running image if possible';
 						newLine].
 	PhLLaunchImageCommand warnOnArchMismatch: false.
-	anImage launch
+	anImage launchFrom: FileSystem workingDirectory
 ]
 
 { #category : #accessing }

diff --git a/src/PharoLauncher-Core/PhLImage.class.st b/src/PharoLauncher-Core/PhLImage.class.st
@@ -359,6 +359,13 @@ PhLImage >> launchConfigurations: aCollection [
 	launchConfigurations := aCollection
 ]
 
+{ #category : #action }
+PhLImage >> launchFrom: aDirectoryReference [
+	^ self launchWithConfiguration: (self defaultLaunchConfiguration
+			   workingDirectory: aDirectoryReference;
+			   yourself)
+]
+
 { #category : #accessing }
 PhLImage >> launchScript [
 	^ String streamContents: [ :stream |

diff --git a/src/PharoLauncher-Core/PhLLaunchConfiguration.class.st b/src/PharoLauncher-Core/PhLLaunchConfiguration.class.st
@@ -15,7 +15,8 @@ Class {
 		'imageArguments',
 		'usePharoSettings',
 		'vm',
-		'vmArguments'
+		'vmArguments',
+		'workingDirectory'
 	],
 	#classVars : [
 		'LaunchInALoginShell'
@@ -126,6 +127,7 @@ PhLLaunchConfiguration >> initializeWithImage: anImage [
 	name := 'new configuration...'.
 	usePharoSettings := true.
 	imageArguments := anImage defaultArguments.
+	workingDirectory := anImage imageFile parent
 ]
 
 { #category : #testing }
@@ -192,3 +194,13 @@ PhLLaunchConfiguration >> vmArguments [
 PhLLaunchConfiguration >> vmArguments: aCollection [ 
 	vmArguments := aCollection
 ]
+
+{ #category : #accessing }
+PhLLaunchConfiguration >> workingDirectory [
+	^ workingDirectory
+]
+
+{ #category : #accessing }
+PhLLaunchConfiguration >> workingDirectory: aFileReference [
+	workingDirectory := aFileReference
+]
diff --git a/src/PharoLauncher-Core/PhLLaunchImageProcessConfigurator.class.st b/src/PharoLauncher-Core/PhLLaunchImageProcessConfigurator.class.st
@@ -76,7 +76,7 @@ PhLLaunchImageProcessConfigurator >> usePharoSettings [
 { #category : #visiting }
 PhLLaunchImageProcessConfigurator >> visit [
 	process := PhLProcessWrapper new.
-	process workingDirectory: self imageFile parent pathString.
+	process workingDirectory: launchConfiguration workingDirectory pathString.
 	self configureVm.
 	process
 		addArgument: self imageFile pathString surroundedByDoubleQuotes.