Merge branch 'hotfix/0.6.4' into main

cake-build · Dec 9, 2015 · 8bb5f80 · 8bb5f80
2 parents 21b8247 + 54b48ba
commit 8bb5f80
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,3 +1,6 @@
+### New in 0.6.4 (Released 2015/12/09)
+* Quoted process fails on unix
+
 ### New in 0.6.3 (Released 2015/12/07)
 * ProcessStartInfo filename not always Quoted
 * Support spaces in MSBuild configuration

diff --git a/src/Cake.Core/IO/ProcessRunner.cs b/src/Cake.Core/IO/ProcessRunner.cs
@@ -48,13 +48,16 @@ public IProcess Start(FilePath filePath, ProcessSettings settings)
                 throw new ArgumentNullException("settings");
             }
 
+            // Get the fileName
+            var fileName = _environment.IsUnix() ? filePath.FullPath : filePath.FullPath.Quote();
+
             // Get the arguments.
             var arguments = settings.Arguments ?? new ProcessArgumentBuilder();
 
             if (!settings.Silent)
             {
                 // Log the filename and arguments.
-                var message = string.Concat(filePath, " ", arguments.RenderSafe().TrimEnd());
+                var message = string.Concat(fileName, " ", arguments.RenderSafe().TrimEnd());
                 _log.Verbose(Verbosity.Diagnostic, "Executing: {0}", message);
             }
 
@@ -63,7 +66,7 @@ public IProcess Start(FilePath filePath, ProcessSettings settings)
             settings.WorkingDirectory = workingDirectory.MakeAbsolute(_environment);
 
             // Create the process start info.
-            var info = new ProcessStartInfo(filePath.FullPath.Quote())
+            var info = new ProcessStartInfo(fileName)
             {
                 Arguments = arguments.Render(),
                 WorkingDirectory = workingDirectory.FullPath,

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
@@ -6,8 +6,8 @@
 using System.Reflection;
 
 [assembly: AssemblyProduct("Cake")]
-[assembly: AssemblyVersion("0.6.3")]
-[assembly: AssemblyFileVersion("0.6.3")]
-[assembly: AssemblyInformationalVersion("0.6.3")]
+[assembly: AssemblyVersion("0.6.4")]
+[assembly: AssemblyFileVersion("0.6.4")]
+[assembly: AssemblyInformationalVersion("0.6.4")]
 [assembly: AssemblyCopyright("Copyright (c) Patrik Svensson, Mattias Karlsson, Gary Ewan Park and contributors")]
 
diff --git a/tools/packages.config b/tools/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="Cake" version="0.6.2" />
+    <package id="Cake" version="0.6.3" />
     <package id="xunit.runner.console" version="2.0.0" />
     <package id="gitreleasemanager" version="0.3.0" />
 </packages>