Merge pull request cake-build#873 from heilingbrunner/develop

GH874: To support Windows path with blanks, NSIS script file names must be w…
gep13 · Jun 5, 2016 · c68360c · c68360c
2 parents 142516e + b546d7d
commit c68360c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Cake.Common.Tests/Unit/Tools/NSIS/MakeNSISRunnerTests.cs b/src/Cake.Common.Tests/Unit/Tools/NSIS/MakeNSISRunnerTests.cs
@@ -158,7 +158,7 @@ public void Should_Add_Defines_To_Arguments_If_Provided()
                 var result = fixture.Run();
 
                 // Then
-                Assert.Equal("/DFoo=Bar /DTest /DTest2 /Working/Test.nsi", result.Args);
+                Assert.Equal("/DFoo=Bar /DTest /DTest2 \"/Working/Test.nsi\"", result.Args);
             }
 
             [Fact]
@@ -172,7 +172,7 @@ public void Should_Add_NoChangeDirectory_To_Arguments_If_Provided()
                 var result = fixture.Run();
 
                 // Then
-                Assert.Equal("/NOCD /Working/Test.nsi", result.Args);
+                Assert.Equal("/NOCD \"/Working/Test.nsi\"", result.Args);
             }
 
             [Fact]
@@ -186,7 +186,7 @@ public void Should_Add_NoConfig_To_Arguments_If_Provided()
                 var result = fixture.Run();
 
                 // Then
-                Assert.Equal("/NOCONFIG /Working/Test.nsi", result.Args);
+                Assert.Equal("/NOCONFIG \"/Working/Test.nsi\"", result.Args);
             }
         }
     }

diff --git a/src/Cake.Common/Tools/NSIS/MakeNSISRunner.cs b/src/Cake.Common/Tools/NSIS/MakeNSISRunner.cs
@@ -92,8 +92,8 @@ private ProcessArgumentBuilder GetArguments(FilePath scriptFile, MakeNSISSetting
                 builder.Append("/NOCONFIG");
             }
 
-            // Script file
-            builder.Append(scriptFile.MakeAbsolute(_environment).FullPath);
+            // Quoted Script file
+            builder.AppendQuoted(scriptFile.MakeAbsolute(_environment).FullPath);
 
             return builder;
         }