diff --git a/config/20-makedist-autobuild b/config/20-makedist-autobuild
index be5d611..18af7a9 100755
--- a/config/20-makedist-autobuild
+++ b/config/20-makedist-autobuild
@@ -40,10 +40,8 @@ SOURCEDIR=/var/makedist
}
if [ "$RELEASE" ]; then
- DESTLATESTFILENAME=latest-$RELEASE.inc.js
SOURCEIMGFILEPREFIX="openmamba-$DISTVERSION"
else
- DESTLATESTFILENAME=latest.inc.js
SOURCEIMGFILEPREFIX="openmamba"
fi
@@ -102,8 +100,8 @@ function do_makedist() {
LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=${MAKEDIST_FORCE}"
makedist openmamba PLATFORM=${DESTPLATFORM} SUBPLATFORM=${DESTSUBPLATFORM} \
LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=${MAKEDIST_FORCE} || {
- echo "Error building openmamba ${DESTPRODUCTNAME} medium; aborting."
- exit 1
+ echo "Error building openmamba ${DESTPRODUCTNAME} medium; skipping."
+ return 255
}
DIST_CREATED=1
fi
@@ -159,7 +157,7 @@ LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=${MAKEDIST_FORCE} || {
DESTMD5=`cat $DESTMD5 | gawk '{ print $1 }'`
DESTBUILDDATE=`stat -c %y $SOURCEIMG`
- cat > $DESTDIR/$DESTLATESTFILENAME << _EOF
+ cat >> $DESTDIR/$DESTLATESTFILENAME << _EOF
nameArray['$DESTPRODUCTNAME-$RELEASETAG-$DESTLANGUAGE-$DESTARCH']='$DESTNAME';
pathArray['$DESTPRODUCTNAME-$RELEASETAG-$DESTLANGUAGE-$DESTARCH']='/download.html?file=$DESTBASEURL/$DESTPRODUCTNAME/$DESTLANGUAGE/';
sizeArray['$DESTPRODUCTNAME-$RELEASETAG-$DESTLANGUAGE-$DESTARCH']='$DESTSIZE';
@@ -239,7 +237,16 @@ _EOF
#>> $tempfile.$5
DIST_DWD=""
DIST_LINE="${MEDIA_NAME[$m]}"
@@ -289,12 +294,13 @@ _EOF
chmod +r $DESTHTML
if [ "$DIST_CREATED" = "1" ]; then
# snapshots
- makedist-announcement --send-email $DISTVERSION $PRODNAME
+ makedist-announcement --rebuild-announcement --send-email $DISTVERSION $PRODNAME
elif [ "$RELEASEPLATFORM" = "$MEDIUMPLATFORM" -a \
"$RELEASESUBPLATFORM" = "$MEDIUMSUBPLATFORM" ]; then
# stable
- makedist-announcement --send-test-email $DISTVERSION $PRODNAME
+ makedist-announcement --rebuild-announcement --send-test-email $DISTVERSION $PRODNAME
fi
+ return $DIST_CREATED
}
releasetempfile=`tempfile 2>/dev/null` || releasetempfile=/tmp/makedist_tmpfile
@@ -359,10 +365,12 @@ for i in `seq 0 $ALLMEDIASLAST`; do
done
# build all media and create html page of language ${l}
- [ "$latest" -o ! "$SIMULATE" -o "$RELEASE" ] &&
+ [ "$latest" -o ! "$SIMULATE" -o "$RELEASE" ] && {
do_makedist_and_html \
$medium_suffix $RELEASETAG \
$PLATFORM "$SUBPLATFORM" ${l} $PRODUCT_NAME ${i}
+ [ $? -eq 255 ] && break
+ }
done
done