From 90803f562da736bbe85fdce942bb0bf22031387e Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 18 Aug 2007 02:59:35 +0200
Subject: [PATCH] GitMe: inline 7z's install script

There is no need to maintain this script in its own file; furthermore,
it does not need CR/LF (I actually tested it).  Therefore, we
can just do away with the crlf attributes for 7z-install.txt.

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

diff --git a/share/GitMe/.gitattributes b/share/GitMe/.gitattributes
deleted file mode 100644
index e359c55e..00000000
--- a/share/GitMe/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-bootstrap.cmd -crlf
-7z-install.txt -crlf
diff --git a/share/GitMe/7z-install.txt b/share/GitMe/7z-install.txt
deleted file mode 100644
index ab936648..00000000
--- a/share/GitMe/7z-install.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-;!@Install@!UTF-8!
-Title="GitMe: MinGW Git + MSys installation"
-BeginPrompt="This archive contains the minimal system needed to\nbootstrap the latest MinGW Git and MSys environment"
-CancelPrompt="Do you want to cancel MSysGit installation?"
-ExtractDialogText="Please, wait..."
-ExtractPathText="Where do you want to install MSysGit?"
-ExtractTitle="Extracting..."
-GUIFlags="8+32+64+256+4096"
-GUIMode="1"
-InstallPath="C:\\msysgit"
-OverwriteMode="2"
-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/release.sh b/share/GitMe/release.sh
index e18dbe5f..c9507bae 100644
--- a/share/GitMe/release.sh
+++ b/share/GitMe/release.sh
@@ -30,6 +30,22 @@ cp "$SHARE"/setup-msysgit.sh ./ &&
 echo "Creating archive" &&
 cd .. &&
 7z a $OPTS7 "$TMPPACK" installer-tmp &&
-cat /share/7-Zip/7zSD.sfx "$SHARE"/7z-install.txt "$TMPPACK" > "$TARGET" &&
+(cat /share/7-Zip/7zSD.sfx &&
+ echo ';!@Install@!UTF-8!' &&
+ echo 'Title="GitMe: MinGW Git + MSys installation"' &&
+ echo 'BeginPrompt="This archive contains the minimal system needed to\nbootstrap the latest MinGW Git and MSys environment"' &&
+ echo 'CancelPrompt="Do you want to cancel MSysGit installation?"' &&
+ echo 'ExtractDialogText="Please, wait..."' &&
+ echo 'ExtractPathText="Where do you want to install MSysGit?"' &&
+ echo 'ExtractTitle="Extracting..."' &&
+ echo 'GUIFlags="8+32+64+256+4096"' &&
+ echo 'GUIMode="1"' &&
+ echo 'InstallPath="C:\\msysgit"' &&
+ echo 'OverwriteMode="2"' &&
+ echo 'RunProgram="%%T\installer-tmp\bin\sh.exe /setup-msysgit.sh"' &&
+ echo 'Delete="%%T\installer-tmp"' &&
+ echo 'RunProgram="%%T\bin\sh.exe --login -i"' &&
+ echo ';!@InstallEnd@!' &&
+ cat "$TMPPACK") > "$TARGET" &&
 echo Success! You\'ll find the new installer at $TARGET
 rm $TMPPACK
-- 
2.11.4.GIT