Added a --force flag to guarantee a successful pull.

[people/pmueller/ipfire-2.x.git] / tools / make-functions

diff --git a/tools/make-functions b/tools/make-functions
index c41f4c69a5cd1f428659742b205a537ab3048456..a357d0620122dac818e1e90b4c20577aa61a9e42 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -492,9 +492,11 @@ batch_script() {
 
        if [ "$IPFIRE_REBUILD" -eq "0" ]; then
                export IPFIRE_START_TIME=`date`
+
+               $0 clean
                evaluate 1
 
-               $0 git update
+               $0 git update --force
                evaluate 1 mail_me UPDATE
 
                echo "### EXPORT SOURCES"
@@ -507,12 +509,12 @@ batch_script() {
        evaluate 1 mail_me ERROR
 
        echo "### UPLOADING ISO"
-       #$0 upload iso
-       #evaluate 1 mail_me ISO
+       $0 upload iso
+       evaluate 1 mail_me ISO
        
        echo -ne "### UPLOADING PAKS"
-       #$0 upload paks
-       #evaluate 1 mail_me PAKS
+       $0 upload paks
+       evaluate 1 mail_me PAKS
 
        echo -ne "${BOLD}***SUCCESS!${NORMAL}"
        mail_me success