[MinGW-cvs] msys/dvlpr/bin msys.bat,1.13,1.14

Update of /cvsroot/mingw/msys/dvlpr/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1174/bin

Modified Files:
	msys.bat 
Log Message:
	* bin/msys.bat: Restart in Win32 compatibility mode on x64.
	(startsh): Fix %WD%\sh.exe typo.


Index: msys.bat
===================================================================
RCS file: /cvsroot/mingw/msys/dvlpr/bin/msys.bat,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** msys.bat	6 Jul 2005 17:38:00 -0000	1.13
--- msys.bat	8 Dec 2005 21:33:00 -0000	1.14
***************
*** 1,4 ****
  @echo off
! rem Copyright (C):  2001, 2002, 2003, 2004  Earnie Boyd
  rem   mailto:ea...@us...
  rem This file is part of Minimal SYStem
--- 1,4 ----
  @echo off
! rem Copyright (C):  2001, 2002, 2003, 2004, 2005  Earnie Boyd
  rem   mailto:ea...@us...
  rem This file is part of Minimal SYStem
***************
*** 6,11 ****
  rem
  rem File:	    msys.bat
! rem Revision:	    2.2
! rem Revision Date:  March 28th, 2004
  
  rem ember to set the "Start in:" field of the shortcut.
--- 6,11 ----
  rem
  rem File:	    msys.bat
! rem Revision:	    2.4
! rem Revision Date:  December 8th, 2005
  
  rem ember to set the "Start in:" field of the shortcut.
***************
*** 36,39 ****
--- 36,47 ----
  :_WindowsNT
  
+ rem Hopefully a temporary workaround for getting MSYS shell to run on x64
+ rem (WoW64 cmd prompt sets PROCESSOR_ARCHITECTURE to x86)
+ if not "x%PROCESSOR_ARCHITECTURE%" == "xAMD64" goto _NotX64
+ set COMSPEC=%WINDIR%\SysWOW64\cmd.exe
+ %COMSPEC% /c %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
+ goto EOF
+ :_NotX64
+ 
  if NOT EXIST %WD%msys-1.0.dll set WD=%~dp0\bin\
  
***************
*** 82,86 ****
  
  :startsh
! if NOT EXIST %WD%\sh.exe goto notfound
  start %WD%sh --login -i
  exit
--- 90,94 ----
  
  :startsh
! if NOT EXIST %WD%sh.exe goto notfound
  start %WD%sh --login -i
  exit
***************
*** 166,167 ****
--- 174,186 ----
  rem     * If rxvt.exe cannot be found, try sh.exe.
  rem
+ rem 2005.12.06  Tuomo Latto  mailto:non...@us...
+ rem     * Added a temporary workaround for getting MSYS shell to run on x64.
+ rem
+ rem 2005.12.07  Keith Marshall  mailto:kei...@us...
+ rem     * ``EXISTS %WD%\sh.exe'' should be ``EXISTS %WD%sh.exe''; corrected.
+ rem     * Modified Tuomo's patch, to avoid trashing Window settings in Win32.
+ rem
+ rem 2005.12.08  Tuomo Latto  mailto:non...@us...
+ rem     * Keith's modified patch fails on x64; start did funny things.
+ rem     Reworked, for correct behaviour on both platforms.
+ rem