From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 12 Aug 2008 17:00:41 +0000 (+0000)
Subject: It should be done like this... Minor change.
X-Git-Tag: v3.0-alpha1~776
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2653d8159f0e4fecc424eb9cc68787028a44fd9;p=ipfire-3.x.git

It should be done like this... Minor change.
---

diff --git a/tools/make-batch b/tools/make-batch
index 050b27a08..9dc17dc72 100644
--- a/tools/make-batch
+++ b/tools/make-batch
@@ -31,6 +31,7 @@ batch_start() {
 		exit 1
 	fi
 
+	git checkout -f # Remove all local changes !!!
 	git_pull --batch
 
 	if [ -e "$FAILED" ]; then
diff --git a/tools/make-beautify b/tools/make-beautify
index f1b269dcc..f65942a40 100644
--- a/tools/make-beautify
+++ b/tools/make-beautify
@@ -132,12 +132,12 @@ beautify() {
 			MESSAGE="$3"
 			echo -ne "${BOLD}${MESSAGE}${NORMAL}${SET_RESULT_COL}${BRACKET_L}"
 			case "$2" in
-				DONE) echo -ne "${DONE} DONE ${NORMAL}";;
-				WARN) echo -ne "${WARN} WARN ${NORMAL}";;
-				FAIL) echo -ne "${FAIL} FAIL ${NORMAL}";;
-				SKIP) echo -ne "${SKIP} SKIP ${NORMAL}";;
-				ON|ENAB*) echo -ne "${DONE} ENAB ${NORMAL}";;
-				OFF|DISA*) echo -ne "${FAIL} DISA ${NORMAL}";;
+				DONE) echo -ne " ${DONE}DONE${NORMAL} ";;
+				WARN) echo -ne " ${WARN}WARN${NORMAL} ";;
+				FAIL) echo -ne " ${FAIL}FAIL${NORMAL} ";;
+				SKIP) echo -ne " ${SKIP}SKIP${NORMAL} ";;
+				ON|ENAB*)  echo -ne " ${DONE}ENAB${NORMAL} ";;
+				OFF|DISA*) echo -ne " ${FAIL}DISA${NORMAL} ";;
 			esac
 			echo -ne "${BRACKET_R}\n"
 			;;
@@ -176,9 +176,9 @@ beautify() {
 			SET_TIME_COL_REAL=`position_cursor $RESULT_COL $PKG_TIME -3`
 			echo -ne "${SET_TIME_COL}${BRACKET_L} ${BOLD}${SET_TIME_COL_REAL}$PKG_TIME${NORMAL} ${BRACKET_R}"
 			case "$RESULT" in
-				DONE) echo -ne "${SET_RESULT_COL}${BRACKET_L}${DONE} DONE ${NORMAL}${BRACKET_R}\n";;
-				FAIL) echo -ne "${SET_RESULT_COL}${BRACKET_L}${FAIL} FAIL ${NORMAL}${BRACKET_R}\n";;
-				SKIP) echo -ne "${SET_RESULT_COL}${BRACKET_L}${SKIP} SKIP ${NORMAL}${BRACKET_R}\n";;
+				DONE) echo -ne "${SET_RESULT_COL}${BRACKET_L} ${DONE}DONE${NORMAL} ${BRACKET_R}\n";;
+				FAIL) echo -ne "${SET_RESULT_COL}${BRACKET_L} ${FAIL}FAIL${NORMAL} ${BRACKET_R}\n";;
+				SKIP) echo -ne "${SET_RESULT_COL}${BRACKET_L} ${SKIP}SKIP${NORMAL} ${BRACKET_R}\n";;
 			esac
 			;;
 	esac