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

diff --git a/tools/make-batch b/tools/make-batch
index 050b27a08f5d2d39a73b0af9644d3720dd61a1be..9dc17dc727989d5c6143734d2ee8a3fe147b348e 100644 (file)
--- 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 f1b269dcc1c431593ca7caf01aad6a7a1e7419d4..f65942a402e547f4629183e6ab139b0484a1d010 100644 (file)
--- 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