Improve invokation of Unix utilities when running within Wine

livecodefraser · livecodefraser · commit b9d034ec76e6 · 2015-05-28T15:58:34.000+01:00
diff --git a/util/invoke-unix-wine.exe b/util/invoke-unix-wine.exe
@@ -4,5 +4,5 @@
 command=$1
 shift
 
-"$command" $@
-
+$(winepath --unix "$command") $@
+exit $?
diff --git a/util/invoke-unix.bat b/util/invoke-unix.bat
@@ -4,18 +4,27 @@ REM This batch file forwards commands to a Unix-like shell
 REM
 REM We need to work around what looks to be a MCVS bug: the final parameter is
 REM missing the terminating '"' when quoted
+SET commands=%*"
+
+@echo Invoking Unix command '%commands%'
+
+REM Does this look like a wine environment?
+REM We guess this by looking for a common-ish Wine env var
+IF DEFINED WINEDEBUG (
+  START /wait %~dp0\invoke-unix-wine.exe %commands%
+  EXIT %ERRORLEVEL%
+)
 
-@echo Invoking Unix command '%*"'
 
 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 %*"`)  DO SET cygwin_cmd=!cygwin_cmd! %%x
 
   C:\Cygwin\bin\bash.exe -c 'cd !cygwin_cd! ^&^& !cygwin_cmd!'
-) ELSE (
-  invoke-unix-wine.exe %*"
+  EXIT %ERRORLEVEL%
 )
 
-EXIT %ERRORLEVEL%
+@echo Could not find Cygwin or wine
+EXIT 1
 
