From 4b5a262c87b6bf012c986e969c0f5e19962cd70f Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 18 Aug 2007 02:55:01 +0200
Subject: [PATCH] GitMe: avoid dependency on cmd.exe

We already have an interpreter in msysgit.  Better yet, we can rely
on it being the same on all platforms, because we install it.  So we
might just as well use it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 share/GitMe/7z-install.txt |  3 ++-
 share/GitMe/bootstrap.cmd  | 30 ------------------------------
 share/GitMe/release.sh     |  1 -
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 share/GitMe/bootstrap.cmd

diff --git a/share/GitMe/7z-install.txt b/share/GitMe/7z-install.txt
index 2139aa2a..ab936648 100644
--- a/share/GitMe/7z-install.txt
+++ b/share/GitMe/7z-install.txt
@@ -9,6 +9,7 @@ GUIFlags="8+32+64+256+4096"
 GUIMode="1"
 InstallPath="C:\\msysgit"
 OverwriteMode="2"
-RunProgram="%%T\installer-tmp\bootstrap.cmd"
+RunProgram="%%T\installer-tmp\bin\sh.exe /setup-msysgit.sh"
 Delete="%%T\installer-tmp"
+RunProgram="%%T\bin\sh.exe --login -i"
 ;!@InstallEnd@!
diff --git a/share/GitMe/bootstrap.cmd b/share/GitMe/bootstrap.cmd
deleted file mode 100644
index 5cf87048..00000000
--- a/share/GitMe/bootstrap.cmd
+++ /dev/null
@@ -1,30 +0,0 @@
-@echo off
-
-title Git for Windows (Dev) Installer
-
-echo.
-echo Installing Git development environment for Windows
-echo.
-
-set INSTALL_ROOT=%cd%
-set INSTALL_DIR=%~dp0
-
-%INSTALL_DIR%\bin\sh.exe /setup-msysgit.sh
-if ERRORLEVEL 1 call :error Setting up MSys failed
-
-if NOT EXIST %INSTALL_ROOT%\msys.bat call :error Unable to start MSys
-%INSTALL_ROOT%\msys.bat
-
-rem We never actually return here from msys.bat
-
-goto :eof
-
-rem ==============
-
-:error
-echo.
-echo Error: %*
-echo.
-echo INSTALLATION ABORTED !!!
-pause
-exit 1
diff --git a/share/GitMe/release.sh b/share/GitMe/release.sh
index ad8c3dcc..e18dbe5f 100644
--- a/share/GitMe/release.sh
+++ b/share/GitMe/release.sh
@@ -26,7 +26,6 @@ cat "$SHARE"/fileList-mingw.txt |
 strip bin/*.exe &&
 mkdir etc &&
 cp "$SHARE"/gitconfig etc/ &&
-cp "$SHARE"/bootstrap.cmd ./ &&
 cp "$SHARE"/setup-msysgit.sh ./ &&
 echo "Creating archive" &&
 cd .. &&
-- 
2.11.4.GIT