Dem Installer ne bessere Rechnung fuer die Diskgroessen bekommen.

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

diff --git a/tools/make-functions b/tools/make-functions
index 36df4c1ce53de3db2a8c91ac5952d0b7a20c54fb..2a76148b3cdf11668f337c7bceb4a5fe4302a6c4 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -479,7 +479,7 @@ batch_script() {
        fi
 
        echo "### RUNNING BUILD"
-       $0 build --devel
+       $0 build #--devel
        evaluate 1 mail_me ERROR
 
        echo "### UPLOADING ISO"
@@ -487,7 +487,6 @@ batch_script() {
        evaluate 1 mail_me ISO
        
        echo -ne "### UPLOADING PAKS"
-       $0 packages sign
        $0 upload paks
        evaluate 1 mail_me PAKS
 
@@ -543,12 +542,12 @@ END
        esac
        tar cfz $ATTACHMENT log/_build*
        cat /tmp/ipfire_mail_body | tools/sendEmail -q \
-               -f $MAIL_USER \
-               -t $MAIL_TO \
-               -u $SUBJECT \
+               -f "$MAIL_FROM" \
+               -t "$MAIL_TO" \
+               -u "$SUBJECT" \
                -s $MAIL_SERVER:25 \
-               -xu $MAIL_USER \
-               -xp $MAIL_PASS \
+               -xu "$MAIL_USER" \
+               -xp "$MAIL_PASS" \
                -l log/_build.mail.log \
                -a $ATTACHMENT # -v
        if [ "$?" -eq "0" ]; then
@@ -627,6 +626,8 @@ make_config() {
                echo -ne "You should enter a mail server to login...\n"
                echo -ne "Please type the url: "
                read MAIL_SERVER
+               echo -ne "Please type where the email is from: "
+               read MAIL_FROM
                echo -ne "Please type the username: "
                read MAIL_USER
                echo -ne "Please type the password (hidden): "
@@ -647,6 +648,7 @@ FTP_CACHE_USER=$FTP_CACHE_USER
 FTP_CACHE_PASS=$FTP_CACHE_PASS
 ### mail reports
 MAIL_TO="$MAIL_TO"
+MAIL_FROM=$MAIL_FROM
 MAIL_SERVER=$MAIL_SERVER
 MAIL_USER=$MAIL_USER
 MAIL_PASS=$MAIL_PASS
@@ -710,35 +712,3 @@ update_langs() {
                $BASEDIR/tools/check_langs.sh > $BASEDIR/doc/language_missings
                beautify message DONE
 }
-
-sign_packages() {
-       if gpg --list-key 64D96617 ; then
-               if [ -d "$BASEDIR/packages" ]; then
-                       cd $BASEDIR/packages
-               for i in `ls $BASEDIR/packages/*.ipfire`; do
-                       echo -n "Signing $i"
-                               echo $GPG_PASSPHRASE | gpg --compress-algo 3 --sign --armor -u 64D96617 --passphrase-fd 0 $i
-                               if [ "$?" -eq "0" ]; then
-                                       beautify message DONE
-                                       mv -f $i.asc $i
-                               else
-                                       beautify message FAIL
-                               fi
-               done
-               for i in `ls $BASEDIR/packages/meta-*`; do
-                       echo -n "Signing $i"
-                               echo $GPG_PASSPHRASE | gpg --clearsign --armor -u 64D96617 --passphrase-fd 0 $i
-                               if [ "$?" -eq "0" ]; then
-                                       beautify message DONE
-                                       mv -f $i.asc $i
-                               else
-                                       beautify message FAIL
-                               fi
-               done
-               cd -
-       fi
-       else
-               echo -n "You don't have the secret key to sign ipfire's packages!"
-               beautify message FAIL
-       fi
-}