From 2c8b4e6cc481ab6d93b3924d99ec15549be422d7 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
Date: Thu, 9 Aug 2007 08:52:06 +0200
Subject: [PATCH] Convert the netinstallers setup-msysgit.sh script to Unix
 EOLs. Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>

---
 share/GitMe/setup-msysgit.sh | 144 +++++++++++++++++++++----------------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/share/GitMe/setup-msysgit.sh b/share/GitMe/setup-msysgit.sh
index 0b021816..303acc72 100644
--- a/share/GitMe/setup-msysgit.sh
+++ b/share/GitMe/setup-msysgit.sh
@@ -1,72 +1,72 @@
-#!/bin/sh
-
-# We're already in the install directory
-INSTALL_PATH=`pwd`
-export PATH=$INSTALL_PATH/installer-tmp/bin:$PATH
-
-error () {
-    echo "* error: $*"
-    echo INSTALLATION ABORTED
-    read -e IGNORED_INPUT
-    trap - exit
-    exit 1
-}
-
-
-echo -------------------------------------------------------
-echo Fetching the latest MSys environment
-echo -------------------------------------------------------
-MSYSGIT_REPO_GIT=repo.or.cz/msysgit.git
-MSYSGIT_REPO_HTTP=repo.or.cz/r/msysgit.git
-
-git init &&
-git config remote.origin.url git://$MSYSGIT_REPO_GIT &&
-git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*' &&
-git config remote.mob.url \
-        ssh://mob@$MSYSGIT_REPO_GIT &&
-git config remote.mob.fetch +refs/remote/mob:refs/remotes/origin/mob &&
-git config remote.mob.push master:mob &&
-(git fetch ||
-        (git config remote.origin.url \
-                http://$MSYSGIT_REPO_HTTP &&
-         git fetch))
-
-# This following works, but would not fall back on curl if git:// protocol couldn't be used
-#git-clone -n $MSYSGIT_REPO /msysgit-tmp ||
-#mv /msysgit-tmp/.git $INSTALL_PATH/.git
-#rm -rf /msysgit-tmp ||
-#    error Couldn\'t clone $MSYSGIT_REPO! 
-
-
-echo
-echo -------------------------------------------------------
-echo Checking out the master branch
-echo -------------------------------------------------------
-git-checkout -l -f -b master origin/master ||
-    error Couldn\'t checkout the master branch!
-
-
-# TEMP: Remove pre-existing git directory
-rm -rf git
-
-
-echo
-echo -------------------------------------------------------
-echo Fetching the latest MinGW Git sources
-echo -------------------------------------------------------
-MINGW_REPO_GIT=git://repo.or.cz/git/mingw/4msysgit.git
-MINGW_REPO_HTTP=http://repo.or.cz/r/git/mingw/4msysgit.git
-
-git-submodule init &&
-(git-submodule update ||
-    (git config submodule.git.url $MINGW_REPO_HTTP &&
-    rm -rf $INSTALL_PATH/git &&  # Need to clean up after the previous failed submodule update
-    git-submodule update)) ||
-    error Couldn\'t update submodules!
-
-
-echo
-echo -------------------------------------------------------
-echo Install config.mak file in /git
-echo -------------------------------------------------------
-cp $INSTALL_PATH/installer-tmp/config.mak $INSTALL_PATH/git/config.mak
+#!/bin/sh
+
+# We're already in the install directory
+INSTALL_PATH=`pwd`
+export PATH=$INSTALL_PATH/installer-tmp/bin:$PATH
+
+error () {
+    echo "* error: $*"
+    echo INSTALLATION ABORTED
+    read -e IGNORED_INPUT
+    trap - exit
+    exit 1
+}
+
+
+echo -------------------------------------------------------
+echo Fetching the latest MSys environment
+echo -------------------------------------------------------
+MSYSGIT_REPO_GIT=repo.or.cz/msysgit.git
+MSYSGIT_REPO_HTTP=repo.or.cz/r/msysgit.git
+
+git init &&
+git config remote.origin.url git://$MSYSGIT_REPO_GIT &&
+git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*' &&
+git config remote.mob.url \
+        ssh://mob@$MSYSGIT_REPO_GIT &&
+git config remote.mob.fetch +refs/remote/mob:refs/remotes/origin/mob &&
+git config remote.mob.push master:mob &&
+(git fetch ||
+        (git config remote.origin.url \
+                http://$MSYSGIT_REPO_HTTP &&
+         git fetch))
+
+# This following works, but would not fall back on curl if git:// protocol couldn't be used
+#git-clone -n $MSYSGIT_REPO /msysgit-tmp ||
+#mv /msysgit-tmp/.git $INSTALL_PATH/.git
+#rm -rf /msysgit-tmp ||
+#    error Couldn\'t clone $MSYSGIT_REPO! 
+
+
+echo
+echo -------------------------------------------------------
+echo Checking out the master branch
+echo -------------------------------------------------------
+git-checkout -l -f -b master origin/master ||
+    error Couldn\'t checkout the master branch!
+
+
+# TEMP: Remove pre-existing git directory
+rm -rf git
+
+
+echo
+echo -------------------------------------------------------
+echo Fetching the latest MinGW Git sources
+echo -------------------------------------------------------
+MINGW_REPO_GIT=git://repo.or.cz/git/mingw/4msysgit.git
+MINGW_REPO_HTTP=http://repo.or.cz/r/git/mingw/4msysgit.git
+
+git-submodule init &&
+(git-submodule update ||
+    (git config submodule.git.url $MINGW_REPO_HTTP &&
+    rm -rf $INSTALL_PATH/git &&  # Need to clean up after the previous failed submodule update
+    git-submodule update)) ||
+    error Couldn\'t update submodules!
+
+
+echo
+echo -------------------------------------------------------
+echo Install config.mak file in /git
+echo -------------------------------------------------------
+cp $INSTALL_PATH/installer-tmp/config.mak $INSTALL_PATH/git/config.mak
-- 
2.11.4.GIT