From ffee7cd10d95baa1e9211b1e930619be648a566f Mon Sep 17 00:00:00 2001
From: Ron Koenderink <rkoenderink@yahoo.ca>
Date: Sat, 16 Feb 2008 11:09:19 -0600
Subject: [PATCH] Apply the patches using git apply instead of patch

Need to be in the empserver directory before applying
the "git apply" command, move the "cd empserver" to the
clone step. This change also fixes a bug when using
with an existing repository not being the correct
directory when executing the "git pull" command.
Fixes commit acd768e5e2 as it used git diff format.
---
 src/scripts/nightly/nightlybuild.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/scripts/nightly/nightlybuild.sh b/src/scripts/nightly/nightlybuild.sh
index 67c6bf69e..b73951b87 100755
--- a/src/scripts/nightly/nightlybuild.sh
+++ b/src/scripts/nightly/nightlybuild.sh
@@ -112,7 +112,9 @@ then
 		RETR="`expr 1 + ${RETR}`"
 		[ "${RETR}" -gt 5 ] && err "git-clone Timeout after ${RETR} retres."
 	done
+	cd empserver || err "Could not cd to ${BOXDIR}/${WORKDIR}/empserver."
 else
+	cd empserver || err "Could not cd to ${BOXDIR}/${WORKDIR}/empserver."
 	while ! git pull $GITROOT master >/dev/null
 	do
 		sleep "`expr 5 + ${RETR}`"
@@ -142,7 +144,7 @@ echo "Applying global patches from ${BOXDIR}/${WORKDIR}/empserver/src/scripts/ni
 for i in "${BOXDIR}/${WORKDIR}/empserver/src/scripts/nightly/patches/All"/*.patch
 do
 	[ -r "${i}" ] || continue
-	if ${PATCH:=patch} -Np0 < "${i}" >/dev/null
+	if git apply "${i}" >/dev/null
 	then
 		echo "${i}: OK"
 	else
@@ -159,7 +161,7 @@ then
 	for i in "${LOCALPATCHDIRECTORY}"/*.patch
 	do
 		[ -r "${i}" ] || continue
-		if ${PATCH:=patch} -Np0 < "${i}" >/dev/null
+		if git apply "${i}" >/dev/null
 		then
 			echo "${i}: OK"
 		else
@@ -170,8 +172,6 @@ then
 	echo ""
 fi
 
-cd empserver || err "Could not cd to ${BOXDIR}/${WORKDIR}/empserver."
-
 git-pull
 sh ./bootstrap
 ./configure --prefix ${BOXDIR}/${WORKDIR}/emp4
-- 
2.43.0