Quote more paths

dellis1972 · Oct 14, 2024 · 2a1a664 · 2a1a664
1 parent 71426fe
commit 2a1a664
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/MonoGame.Framework.Content.Pipeline/Utilities/BasisUHelpers.cs b/MonoGame.Framework.Content.Pipeline/Utilities/BasisUHelpers.cs
@@ -430,7 +430,7 @@ out string error
         //  basisu -unpack foo.ktx2 -ktx_only -linear -format_only 2
         var linearFlag = basisUFormat.isLinearColorSpace ? "-linear" : "";
         // var linearFlag = "";
-        var argStr = $"-unpack -file {basisFileName} -ktx_only -format_only {basisUFormat.code} {linearFlag}";
+        var argStr = $"-unpack -file \"{basisFileName}\" -ktx_only -format_only {basisUFormat.code} {linearFlag}";
         var exitCode = Run(
             args: argStr,
             stdOut: out var stdOut,
@@ -489,7 +489,7 @@ private static bool TryBuildIntermediateFile(
     {
         var absImageFileName = Path.GetFullPath(imageFileName);
         var uastcFlag = format.nonUastcCompatible ? "": "-uastc";
-        var argStr = $"-file {absImageFileName} {uastcFlag} -ktx2 -output_file {intermediateFileName}";
+        var argStr = $"-file \"{absImageFileName}\" {uastcFlag} -ktx2 -output_file \"{intermediateFileName}\"";
         var exitCode = Run(
             args: argStr,
             stdOut: out var stdOut,

diff --git a/MonoGame.Framework.Content.Pipeline/Utilities/CrunchHelpers.cs b/MonoGame.Framework.Content.Pipeline/Utilities/CrunchHelpers.cs
@@ -233,7 +233,7 @@ out string errorMessage
         )
         {
             errorMessage = null;
-            var argStr = $"-file {pngFileName} -{format.formatString} -out {intermediateFileName} -fileformat ktx -forceprimaryencoding -noNormalDetection";
+            var argStr = $"-file \"{pngFileName}\" -{format.formatString} -out \"{intermediateFileName}\" -fileformat ktx -forceprimaryencoding -noNormalDetection";
             var exitCode = Run(
                 args: argStr,
                 stdOut: out var stdOut,

diff --git a/Tools/MonoGame.Tools.Tests/BuilderTargetsTest.cs b/Tools/MonoGame.Tools.Tests/BuilderTargetsTest.cs
@@ -31,7 +31,7 @@ bool RunBuild(string buildTool, string projectFile, params string[] parameters)
             var tool = FindTool(buildTool);
             var psi = new ProcessStartInfo(tool)
             {
-                Arguments = $"build {projectFile} -t:IncludeContent {string.Join(" ", parameters)} -tl:off -bl -p:DotnetCommand=\"{tool}\"",
+                Arguments = $"build \"{projectFile}\" -t:IncludeContent {string.Join(" ", parameters)} -tl:off -bl -p:DotnetCommand=\"{tool}\"",
                 WorkingDirectory = root,
                 UseShellExecute = false,
                 RedirectStandardOutput = true,