# HG changeset patch
# User John Donoghue
# Date 1549461449 18000
# Node ID cbf69a7357d9a3c4643082b2bbfb21baa9bbca75
# Parent  fa56d6006e32715edb5148aec68e9fad40e775e7
* installer-files/cmdshell.bat: fix OCTAVE_HOME and PATH when is using msys2 mingw32 or mingw64

diff -r fa56d6006e32 -r cbf69a7357d9 installer-files/cmdshell.bat
--- a/installer-files/cmdshell.bat	Wed Feb 06 08:23:17 2019 -0500
+++ b/installer-files/cmdshell.bat	Wed Feb 06 08:57:29 2019 -0500
@@ -4,14 +4,6 @@
 Rem convert to 8.3 format
 for %%I in ("%OCTAVE_HOME%") do set OCTAVE_HOME=%%~sI
 
-Rem   Set up PATH. Make sure the octave bin dir
-Rem   comes first.
-
-set PATH=%OCTAVE_HOME%qt5\bin;%OCTAVE_HOME%bin;%PATH%
-set TERM=cygwin
-set GS=gs.exe
-set GNUTERM=wxt
-
 Rem set home if not already set
 if "%HOME%"=="" set HOME=%USERPROFILE%
 if "%HOME%"=="" set HOME=%HOMEDRIVE%%HOMEPATH%
@@ -29,5 +21,15 @@
 if EXIST %OCTAVE_HOME%\mingw32\bin\octave-cli.exe set MSYSTEM=MINGW32
 if EXIST %OCTAVE_HOME%\mingw64\bin\octave-cli.exe set MSYSTEM=MINGW64
 
+if EXIST %OCTAVE_HOME%\mingw32\bin\octave-cli.exe set OCTAVE_HOME=%OCTAVE_HOME%\mingw32
+if EXIST %OCTAVE_HOME%\mingw64\bin\octave-cli.exe set OCTAVE_HOME=%OCTAVE_HOME%\mingw64
+
+Rem   Set up PATH. Make sure the octave bin dir
+Rem   comes first.
+set PATH=%OCTAVE_HOME%qt5\bin;%OCTAVE_HOME%bin;%PATH%
+set TERM=cygwin
+set GS=gs.exe
+set GNUTERM=wxt
+
 %MSYSDIR%\bin\bash.exe --login -i