Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

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

diff --git a/tools/make-functions b/tools/make-functions
index 1f66787da4d6323968312defaac4cba5745b2fb9..c41f4c69a5cd1f428659742b205a537ab3048456 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -142,7 +142,13 @@ beautify()
                        ;;
                build_end)
                        BUILD_TIME_END=`date +%s`
-                       echo -ne "${DONE}***Build is finished now and took $[ $BUILD_TIME_END - $BUILD_TIME_START ] secs!${NORMAL}\n"
+                       seconds=$[ $BUILD_TIME_END - $BUILD_TIME_START ]
+                       hours=$((seconds / 3600))
+                       seconds=$((seconds % 3600))
+                       minutes=$((seconds / 60))
+                       seconds=$((seconds % 60))
+
+                       echo -ne "${DONE}***Build is finished now and took $hours hour(s) $minutes minute(s) $seconds second(s)!${NORMAL}\n"
                        ;;
                make_pkg)
                        echo "$2" | while read PKG_VER PROGRAM OPTIONS
@@ -501,12 +507,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