From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Thu, 22 Feb 2007 19:36:09 +0000 (+0000)
Subject: Batch-Script wiederhergestellt fuer Detlefs Nightly Builds...
X-Git-Tag: v2.3-beta1~828
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=c85820744f488347586554145a6ef015e6270e53

Batch-Script wiederhergestellt fuer Detlefs Nightly Builds...


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@427 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/make.sh b/make.sh
index 94f0177bb4..632f6ecf97 100644
--- a/make.sh
+++ b/make.sh
@@ -992,7 +992,7 @@ EOF
 	esac
 	;;
 batch)
-	if [ "$2" -eq "--background" ]; then
+	if [ "$2" = "--background" ]; then
 		batch_script
 		exit $?
 	fi
diff --git a/tools/make-functions b/tools/make-functions
index a3b7d1bf4d..8ce5bc2c61 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -463,17 +463,13 @@ batch_script() {
 		export IPFIRE_START_TIME=`date`
 		evaluate 1
 
-		echo -ne "### RUNNING SVN-UPDATE"
+		echo "### RUNNING SVN-UPDATE"
 		$0 svn update
 		evaluate 1 mail_me SVNUPDATE
 
 		echo "### EXPORT SOURCES"
 		$0 svn dist
 		evaluate 1 mail_me SVNDIST
-
-		echo "### RUNNING PREFETCH"
-		$0 downloadsrc | grep -q "md5 difference"
-		evaluate 1 mail_me PREFETCH
 	fi
 
 	echo "### RUNNING BUILD"
@@ -488,7 +484,7 @@ batch_script() {
 	$0 upload paks
 	evaluate 1 mail_me PAKS
 
-	echo -n "${BOLD}***SUCCESS!${NORMAL}"
+	echo -ne "${BOLD}***SUCCESS!${NORMAL}"
 	evaluate 0 mail_me SUCCESS
 	exit 0
 }
@@ -540,12 +536,12 @@ END
 	esac
 	tar cfz $ATTACHMENT log/_build*
 	cat /tmp/ipfire_mail_body | tools/sendEmail -q \
-		-f $IPFIRE_MAIL_FROM \
-		-t $IPFIRE_MAIL_REPORT \
+		-f $MAIL_USER \
+		-t $MAIL_TO \
 		-u $SUBJECT \
-		-s $IPFIRE_MAIL_SERVER:25 \
-		-xu $IPFIRE_MAIL_USER \
-		-xp $IPFIRE_MAIL_PASS \
+		-s $MAIL_SERVER:25 \
+		-xu $MAIL_USER \
+		-xp $MAIL_PASS \
 		-l log/_build.mail.log \
 		-a $ATTACHMENT # -v
 	if [ "$?" -eq "0" ]; then