X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=tools%2Fmake-functions;h=1f66787da4d6323968312defaac4cba5745b2fb9;hb=d6d435090b927be99e82a275a6b4d36529f2a788;hp=c8b63e7ca41c39ffe49102f0364e81c03b2a8ff0;hpb=228638e020d14a2327d0bffa8aa40d746281d050;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/tools/make-functions b/tools/make-functions index c8b63e7ca..1f66787da 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -488,17 +488,16 @@ batch_script() { export IPFIRE_START_TIME=`date` evaluate 1 - echo "### RUNNING SVN-UPDATE" - $0 svn update - evaluate 1 mail_me SVNUPDATE + $0 git update + evaluate 1 mail_me UPDATE echo "### EXPORT SOURCES" - $0 svn dist - evaluate 1 mail_me SVNDIST + $0 git dist + evaluate 1 mail_me DIST fi echo "### RUNNING BUILD" - $0 build #--devel + $0 build evaluate 1 mail_me ERROR echo "### UPLOADING ISO" @@ -526,8 +525,8 @@ mail_me() { case "$1" in success) cat <> /tmp/ipfire_mail_body.$$ -Subject: SUCCESS: IPFIRE-BUILD R$SVN_REVISION on `hostname` -Building IPFire on `hostname` in Revision $SVN_REVISION was successfull! +Subject: SUCCESS: IPFIRE-BUILD on `hostname` +Building IPFire on `hostname` was successfull! You can find the ISO on your ftp server if you told the script where it is. Statistics: @@ -543,7 +542,7 @@ END ;; *) cat <> /tmp/ipfire_mail_body.$$ -Subject: ERROR $1: IPFIRE-BUILD R$SVN_REVISION on `hostname` +Subject: ERROR $1: IPFIRE-BUILD on `hostname` When I was building IPFire on `hostname`, I have found an ERROR with name $1! Here you can see the logs and detect the reason for this error. @@ -560,6 +559,7 @@ END ;; esac +sleep 15 python tools/sendEmail < /tmp/ipfire_mail_body.$$ if [ "$?" -eq "0" ]; then beautify message DONE