Fix shell quoting on windows

hpi-swa · May 22, 2024 · 77baac3 · 77baac3
1 parent 55dc4b4
commit 77baac3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/FileSystem-Git.package/FileSystemGitRepository.class/instance/externalCommand..st b/src/FileSystem-Git.package/FileSystemGitRepository.class/instance/externalCommand..st
@@ -8,5 +8,5 @@ externalCommand: aString
 		^ self externalCommand: aString].
 	osProcess waitForCommand:
 		(osProcess isWindows
-			ifTrue: ['cmd.exe /c "{1} & pause"' format: {aString copyReplaceAll: '"' with: '\"'}]
+			ifTrue: ['cmd.exe /c "{1} & pause"' format: {aString}]
 			ifFalse: [self terminalCommand: aString]).
diff --git a/src/FileSystem-Git.package/FileSystemGitRepository.class/instance/externalGitDo..st b/src/FileSystem-Git.package/FileSystemGitRepository.class/instance/externalGitDo..st
@@ -1,3 +1,3 @@
 git porcelain - external
 externalGitDo: aCommandLineSuffix
-	self externalCommand: ('git -C {1} {2}' format: {repository workingDir pathName copyReplaceAll: ' ' with: '\ '. aCommandLineSuffix}).
+	self externalCommand: ('git -C "{1}" {2}' format: {repository workingDir pathName. aCommandLineSuffix}).
diff --git a/src/FileSystem-Git.package/FileSystemGitRepository.class/methodProperties.json b/src/FileSystem-Git.package/FileSystemGitRepository.class/methodProperties.json
@@ -12,8 +12,8 @@
 		"createBranchNamed:at:" : "jr 3/4/2020 00:47",
 		"detectTerminalCommand" : "mad 4/3/2024 15:10",
 		"expandRemoteRef:" : "pre 6/15/2018 16:04",
-		"externalCommand:" : "mad 5/18/2024 11:18",
-		"externalGitDo:" : "mad 12/20/2023 19:11",
+		"externalCommand:" : "mad 5/22/2024 13:55",
+		"externalGitDo:" : "mad 5/22/2024 13:29",
 		"externalPush:toRemote:force:" : "mad 5/18/2024 12:26",
 		"fetchAllExternalFrom:" : "mad 5/18/2024 11:48",
 		"fetchFrom:" : "mad 4/22/2024 17:34",