Tweak the invoke-unix.bat script to not pathify -args

livecodefraser · livecodefraser · commit 1581fa8867fb · 2015-06-12T10:04:51.000+01:00
diff --git a/util/invoke-unix.bat b/util/invoke-unix.bat
@@ -25,7 +25,9 @@ IF EXIST C:\Cygwin\bin (
   
   REM Obscure way to get the cmd.exe equivalent to `...` substitution
   FOR /F "usebackq tokens=*" %%x IN (`C:\Cygwin\bin\cygpath.exe %CD%`) DO SET cygwin_cd=%%x
-  FOR /F "usebackq tokens=*" %%x IN (`C:\Cygwin\bin\cygpath.exe !commands!`)  DO SET cygwin_cmd=!cygwin_cmd! %%x
+  FOR %%x IN (!commands!) DO (
+    FOR /F "usebackq tokens=*" %%y IN (`C:\Cygwin\bin\bash.exe -c 'if [[ %%x ^=^= -* ]] ^; then echo %%x ^; else /bin/cygpath %%x ^; fi'`) DO SET cygwin_cmd=!cygwin_cmd! %%y
+  )
 
   SET PATH=C:\Cygwin\bin:%PATH%
   C:\Cygwin\bin\bash.exe -c 'cd !cygwin_cd! ^&^& !cygwin_cmd!'
