Quote chmod as it failes with folders containing spaces. fixes #605

seesharper · seesharper · commit 4d8c717fc496 · 2021-02-08T21:55:20.000+01:00
diff --git a/src/Dotnet.Script.Core/Scaffolder.cs b/src/Dotnet.Script.Core/Scaffolder.cs
@@ -63,7 +63,7 @@ public void CreateNewScriptFile(string fileName, string currentDirectory)
                     RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
                 {
                     // mark .csx file as executable, this activates the shebang to run dotnet-script as interpreter
-                    _commandRunner.Execute($"/bin/chmod", $"+x {pathToScriptFile}");
+                    _commandRunner.Execute($"/bin/chmod", $"+x \"{pathToScriptFile}\"");
                 }
                 _scriptConsole.WriteSuccess($"...'{pathToScriptFile}' [Created]");
             }
diff --git a/src/Dotnet.Script.Tests/ScaffoldingTests.cs b/src/Dotnet.Script.Tests/ScaffoldingTests.cs
@@ -25,6 +25,8 @@ public void ShouldInitializeScriptFolder()
         {
             using (var scriptFolder = new DisposableFolder())
             {
+                ScriptTestRunner.Default.ExecuteInProcess($"init {scriptFolder.Path}");
+
                 var (output, exitCode) = ScriptTestRunner.Default.Execute("init", scriptFolder.Path);
 
                 Assert.Equal(0, exitCode);
@@ -34,6 +36,24 @@ public void ShouldInitializeScriptFolder()
             }
         }
 
+        [Fact]
+        public void ShouldInitializeScriptFolderContainingWhitespace()
+        {
+            using (var scriptFolder = new DisposableFolder())
+            {
+                var path = Path.Combine(scriptFolder.Path, "Folder with whitespace");
+                Directory.CreateDirectory(path);
+
+                var (output, exitCode) = ScriptTestRunner.Default.Execute("init", path);
+
+                Assert.Equal(0, exitCode);
+                Assert.DoesNotContain("No such file or directory", output, StringComparison.OrdinalIgnoreCase);
+                Assert.True(File.Exists(Path.Combine(path, "main.csx")));
+                Assert.True(File.Exists(Path.Combine(path, "omnisharp.json")));
+                Assert.True(File.Exists(Path.Combine(path, ".vscode", "launch.json")));
+            }
+        }
+
         [OnlyOnUnixFact]
         public void ShouldRegisterToRunCsxScriptDirectly()
         {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public void CreateNewScriptFile(string fileName, string currentDirectory)`
`63`	`63`	`RuntimeInformation.IsOSPlatform(OSPlatform.Linux))`
`64`	`64`	`{`
`65`	`65`	`// mark .csx file as executable, this activates the shebang to run dotnet-script as interpreter`
`66`		`- _commandRunner.Execute($"/bin/chmod", $"+x {pathToScriptFile}");`
	`66`	`+ _commandRunner.Execute($"/bin/chmod", $"+x \"{pathToScriptFile}\"");`
`67`	`67`	`}`
`68`	`68`	`_scriptConsole.WriteSuccess($"...'{pathToScriptFile}' [Created]");`
`69`	`69`	`}`