Nettraffic aktualisiert.

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

diff --git a/tools/make-functions b/tools/make-functions
index 854477cbb079657d60246fb89b69133a8c75992a..a3b7d1bf4d6a5b7ab4c08544b743eefb7ab6e5ad 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -106,22 +106,24 @@ beautify()
                                        ;;
                        esac
                        ;;
-               build_stage_start)
+               build_stage)
                        MESSAGE=$2
+                       if [ "$STAGE_TIME_START" ]; then
+                               LAST_STAGE_TIME=$[ `date +%s` - $STAGE_TIME_START ]
+                       fi
                        STAGE_TIME_START=`date +%s`
-                       echo -ne "${BOLD}*** ${MESSAGE}${SET_VER_COL}      version${SET_OPT_COL} options"
-                       echo -ne "${SET_TIME_COL} time (sec)${SET_RESULT_COL} status${NORMAL}\n"
-                       ;;
-               build_stage_end)
-                       STAGE_TIME_END=`date +%s`
-                       echo -ne "${BOLD}***This stage took:\t\t $[ $STAGE_TIME_END - $STAGE_TIME_START ] (secs)${NORMAL}\n"
+                       echo -ne "${BOLD}*** ${MESSAGE}${NORMAL}"
+                       if [ "$LAST_STAGE_TIME" ]; then
+                               echo -ne "${DONE} (Last stage took $LAST_STAGE_TIME secs)${NORMAL}"
+                       fi
+                       echo -ne "${BOLD}${SET_VER_COL}      version${SET_OPT_COL} options${SET_TIME_COL} time (sec)${SET_RESULT_COL} status${NORMAL}\n"
                        ;;
                build_start)
                        BUILD_TIME_START=`date +%s`
                        ;;
                build_end)
                        BUILD_TIME_END=`date +%s`
-                       echo -ne "${BOLD}***Build is finished now!\nThis took:\t\t\t $[ $BUILD_TIME_END - $BUILD_TIME_START ] (secs)${NORMAL}\n"
+                       echo -ne "${DONE}***Build is finished now and took $[ $BUILD_TIME_END - $BUILD_TIME_START ] secs!${NORMAL}\n"
                        ;;
                make_pkg)
                        echo "$2" | while read PKG_VER PROGRAM OPTIONS
@@ -628,7 +630,7 @@ make_config() {
                read -s MAIL_PASS
                
        fi
-       echo -ne "${BOLD}***Saving...${NORMAL}"
+       echo -ne "\n${BOLD}***Saving...${NORMAL}"
        cat <<END > $BASEDIR/.config
 ### iso server
 FTP_ISO_URL=$FTP_ISO_URL
@@ -687,9 +689,9 @@ stop_tftpd() {
 }
 
 reload_tftpd() {
-       if [ -e $BASEDIR/ipfire-$VERSION-pxe-$MACHINE.tgz ]; then
+       if [ -e $BASEDIR/ipfire-$VERSION.$MACHINE-pxe.tgz ]; then
                mkdir -p $BASEDIR/tftpboot
-               tar xfz $BASEDIR/ipfire-$VERSION-pxe-$MACHINE.tgz -C $BASEDIR/tftpboot
+               tar xfz $BASEDIR/ipfire-$VERSION.$MACHINE-pxe.tgz -C $BASEDIR/tftpboot
                return 0
        fi
        return 1