;;
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
if [ "$IPFIRE_REBUILD" -eq "0" ]; then
export IPFIRE_START_TIME=`date`
+
+ $0 clean
evaluate 1
- echo "### RUNNING SVN-UPDATE"
- $0 svn update
- evaluate 1 mail_me SVNUPDATE
+ $0 git update --force
+ 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"
}
mail_me() {
- chmod 755 tools/sendEmail
- ATTACHMENT=/tmp/ipfire-build-logs-R$SVN_REVISION.tar.gz
+ echo "From: $MAIL_FROM" > /tmp/ipfire_mail_body.$$
+ echo "To: $MAIL_TO" >> /tmp/ipfire_mail_body.$$
case "$1" in
success)
- SUBJECT="SUCCESS: IPFIRE-BUILD R$SVN_REVISION on `hostname`"
- cat <<END > /tmp/ipfire_mail_body
-Building IPFire on `hostname` in Revision $SVN_REVISION was successfull!
+ cat <<END >> /tmp/ipfire_mail_body.$$
+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:
echo -ne "${BOLD}***Sending success message${NORMAL}"
;;
*)
- SUBJECT="ERROR $1: IPFIRE-BUILD R$SVN_REVISION on `hostname`"
- cat <<END > /tmp/ipfire_mail_body
+ cat <<END >> /tmp/ipfire_mail_body.$$
+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.
echo -ne "${BOLD}***Sending error message${NORMAL}"
;;
esac
- tar cfz $ATTACHMENT log/_build*
- cat /tmp/ipfire_mail_body | tools/sendEmail -q \
- -f "$MAIL_FROM" \
- -t "$MAIL_TO" \
- -u "$SUBJECT" \
- -s $MAIL_SERVER:25 \
- -xu "$MAIL_USER" \
- -xp "$MAIL_PASS" \
- -l log/_build.mail.log \
- -a $ATTACHMENT # -v
+
+sleep 15
+ python tools/sendEmail < /tmp/ipfire_mail_body.$$
if [ "$?" -eq "0" ]; then
beautify message DONE
else
beautify message FAIL
fi
- rm -f /tmp/ipfire_mail_body $ATTACHMENT
+ rm -f /tmp/ipfire_mail_body.$$
}
make_config() {