Fix the path to the "cygpath" tool in invoke-unix.bat

livecodefraser · livecodefraser · commit 7797fc37135a · 2015-06-30T15:06:25.000+01:00
diff --git a/util/invoke-unix.bat b/util/invoke-unix.bat
@@ -41,7 +41,7 @@ SET commands=%commands%
 REM Obscure way to get the cmd.exe equivalent to `...` substitution
 FOR /F "usebackq tokens=*" %%x IN (`%cygwin_path%cygpath.exe %CD%`) DO SET cygwin_cd=%%x
 FOR %%x IN (!commands!) DO (
-  FOR /F "usebackq tokens=*" %%y IN (`%cygwin_path%bash.exe -c 'if [[ \'%%x\' ^=^= -* ]] ^; then echo \'%%x\' ^; else cygpath \'%%x\' ^; fi'`) DO SET cygwin_cmd=!cygwin_cmd! %%y
+  FOR /F "usebackq tokens=*" %%y IN (`%cygwin_path%bash.exe -c 'if [[ \'%%x\' ^=^= -* ]] ^; then echo \'%%x\' ^; else /bin/cygpath \'%%x\' ^; fi'`) DO SET cygwin_cmd=!cygwin_cmd! %%y
 )
 
 REM All the parameters have been Unix-ified; run the command

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ SET commands=%commands%`
`41`	`41`	REM Obscure way to get the cmd.exe equivalent to `...` substitution
`42`	`42`	FOR /F "usebackq tokens=*" %%x IN (`%cygwin_path%cygpath.exe %CD%`) DO SET cygwin_cd=%%x
`43`	`43`	`FOR %%x IN (!commands!) DO (`
`44`		- FOR /F "usebackq tokens=" %%y IN (`%cygwin_path%bash.exe -c 'if [[ \'%%x\' ^=^= - ]] ^; then echo \'%%x\' ^; else cygpath \'%%x\' ^; fi'`) DO SET cygwin_cmd=!cygwin_cmd! %%y
	`44`	+ FOR /F "usebackq tokens=" %%y IN (`%cygwin_path%bash.exe -c 'if [[ \'%%x\' ^=^= - ]] ^; then echo \'%%x\' ^; else /bin/cygpath \'%%x\' ^; fi'`) DO SET cygwin_cmd=!cygwin_cmd! %%y
`45`	`45`	`)`
`46`	`46`
`47`	`47`	`REM All the parameters have been Unix-ified; run the command`