[GRASS-SVN] r55996 - grass/branches/develbranch_6/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: mmetz
Date: 2013-04-25 15:48:26 -0700 (Thu, 25 Apr 2013)
New Revision: 55996

Modified:
   grass/branches/develbranch_6/mswindows/osgeo4w/msys.bat
Log:
update msys.bat to 2009 version

Modified: grass/branches/develbranch_6/mswindows/osgeo4w/msys.bat
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/msys.bat	2013-04-25 22:46:33 UTC (rev 55995)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/msys.bat	2013-04-25 22:48:26 UTC (rev 55996)
@@ -47,26 +47,26 @@
 if NOT EXIST "%WD%msys-1.0.dll" set WD=%~dps0bin\
 rem echo %WD%
 
-rem if installed in a directory containing spaces prepare for a world of pain
-for /F %%i IN ('echo %WD%') DO @set PART1=%%i
-if NOT "%PART1%" == "%WD%" (
-   echo Path names containing spaces are not supported -- aborting.
-   pause
-   exit 1
-)
-
 rem ember Set up option to use rxvt based on value of %1
-if "x%MSYSCON%" == "x" set MSYSCON=rxvt.exe
+set MSYSCON=unknown
 if "x%1" == "x-norxvt" set MSYSCON=sh.exe
 if "x%1" == "x--norxvt" set MSYSCON=sh.exe
-if "x%MSYSCON%" == "xsh.exe" shift
+if "x%1" == "x-rxvt" set MSYSCON=rxvt.exe
+if "x%1" == "x--rxvt" set MSYSCON=rxvt.exe
+if "x%1" == "x-mintty" set MSYSCON=mintty.exe
+if "x%1" == "x--mintty" set MSYSCON=mintty.exe
+if NOT "x%MSYSCON%" == "xunknown" shift
 
-if "x%MSYSTEM%" == "x" set MSYSTEM=MINGW32
+if "x%MSYSCON%" == "xunknown" set MSYSCON=sh.exe
+
+rem the default is a MSYS (user), not a MINGW (developer) console
+if "x%MSYSTEM%" == "x" set MSYSTEM=MSYS
 if "%1" == "MINGW32" set MSYSTEM=MINGW32
 if "%1" == "MSYS" set MSYSTEM=MSYS
 
 if NOT "x%DISPLAY%" == "x" set DISPLAY=
 
+if "x%MSYSCON%" == "xmintty.exe" goto startmintty
 if "x%MSYSCON%" == "xrxvt.exe" goto startrxvt
 if "x%MSYSCON%" == "xsh.exe" goto startsh
 
@@ -80,6 +80,11 @@
 pause
 exit 1
 
+:startmintty
+if NOT EXIST "%WD%mintty.exe" goto startsh
+start "%WD%mintty" /bin/bash -l
+exit
+
 rem If you don't want to use rxvt then rename the file rxvt.exe to something
 rem else.  Then sh.exe will be used instead.
 :startrxvt
@@ -101,7 +106,8 @@
 
 :startsh
 if NOT EXIST "%WD%sh.exe" goto notfound
-start "MSYS 1.0" "%WD%sh" --login -i
+if "x%*" == "x" start "MSYS 1.0" "%WD%sh" --login -i
+if NOT "x%*" == "x" start "MSYS 1.0" "%WD%sh" --login -c "%*"
 exit
 
 :EOF
@@ -195,3 +201,7 @@
 rem     * Keith's modified patch fails on x64; start did funny things.
 rem     Reworked, for correct behaviour on both platforms.
 rem
+rem 2009.03.17  Keith Marshall  mailto:keithmarshall at users.sf.net
+rem     * Add -rxvt or --rxvt switch; start in --norxvt mode by default.
+rem     Make it deterministic; (do not inherit MSYSCON from parent).
+rem