From 01b96e2776c2407e7616199ed613e9a8f82f78cf Mon Sep 17 00:00:00 2001
From: "benjamin%smedbergs.us" <benjamin%smedbergs.us>
Date: Thu, 8 Mar 2007 15:27:08 +0000
Subject: [PATCH] Bug 366852 - MozillaBuild start scripts should launch bash
 (which means copying /bin/sh to /bin/bash), r=luser

---
 tools/build-environment/win32/packageit.sh     | 3 +++
 tools/build-environment/win32/start-msvc6.bat  | 2 +-
 tools/build-environment/win32/start-msvc71.bat | 2 +-
 tools/build-environment/win32/start-msvc8.bat  | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/build-environment/win32/packageit.sh b/tools/build-environment/win32/packageit.sh
index 604ed29cfb86..fffefaa41496 100644
--- a/tools/build-environment/win32/packageit.sh
+++ b/tools/build-environment/win32/packageit.sh
@@ -18,6 +18,9 @@ tar -xjf "${MSYS_SRCDIR}/make-3.81-MSYS-1.0.11-snapshot.tar.bz2" -C "${MSYS_STAG
 # install the uber-new make.exe from Earnie Boyd
 cp "${MSYS_SRCDIR}/make.exe" "${MSYS_STAGEDIR}/mozilla-build/make-3.81/bin"
 
+# copy /bin/sh to /bin/bash
+cp "${MSYS_STAGEDIR}/mozilla-build/msys/bin/sh.exe" "${MSYS_STAGEDIR}/mozilla-build/msys/bin/bash.exe"
+
 # install UPX
 unzip -d "${MSYS_STAGEDIR}/mozilla-build" "${MSYS_SRCDIR}/upx203w.zip"
 
diff --git a/tools/build-environment/win32/start-msvc6.bat b/tools/build-environment/win32/start-msvc6.bat
index a85e0b71ff69..dbe18387989c 100755
--- a/tools/build-environment/win32/start-msvc6.bat
+++ b/tools/build-environment/win32/start-msvc6.bat
@@ -27,4 +27,4 @@ rem Prepend MSVC paths
 call "%VC6DIR%\Bin\vcvars32.bat"
 
 cd "%USERPROFILE%"
-start "MSYS Shell - MSVC6 Environment" "%MOZILLABUILD%\msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Lucida Console" -tn msys -geometry 80x25 -e /bin/sh --login -i
+start "MSYS Shell - MSVC6 Environment" "%MOZILLABUILD%\msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Lucida Console" -tn msys -geometry 80x25 -e /bin/bash --login -i
diff --git a/tools/build-environment/win32/start-msvc71.bat b/tools/build-environment/win32/start-msvc71.bat
index 7f0841efe40c..a958e7f996c1 100755
--- a/tools/build-environment/win32/start-msvc71.bat
+++ b/tools/build-environment/win32/start-msvc71.bat
@@ -43,4 +43,4 @@ if defined MOZBUILD_USE_SDK (
 )
 
 cd "%USERPROFILE%"
-start "MSYS Shell - MSVC7.1 Environment" "%MOZILLABUILD%\msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Lucida Console" -tn msys -geometry 80x25 -e /bin/sh --login -i
+start "MSYS Shell - MSVC7.1 Environment" "%MOZILLABUILD%\msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Lucida Console" -tn msys -geometry 80x25 -e /bin/bash --login -i
diff --git a/tools/build-environment/win32/start-msvc8.bat b/tools/build-environment/win32/start-msvc8.bat
index a5e831a7caa7..df1fec46ed27 100755
--- a/tools/build-environment/win32/start-msvc8.bat
+++ b/tools/build-environment/win32/start-msvc8.bat
@@ -49,4 +49,4 @@ if "%VC8DIR%"=="" (
 )
 
 cd "%USERPROFILE%"
-start "MSYS Shell - MSVC8 Environment" "%MOZILLABUILD%\msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Lucida Console" -tn msys -geometry 80x25 -e /bin/sh --login -i
+start "MSYS Shell - MSVC8 Environment" "%MOZILLABUILD%\msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Lucida Console" -tn msys -geometry 80x25 -e /bin/bash --login -i