diff --git a/bin/makedist-announcement b/bin/makedist-announcement
index 01679e4..fbb0159 100755
--- a/bin/makedist-announcement
+++ b/bin/makedist-announcement
@@ -10,13 +10,11 @@ distribution="openmamba"
TEXTDOMAIN="makedist"; export TEXTDOMAIN
function usage() {
- echo "\
-Usage: makedist-announcement distversion [mediumname] [--rebuild-announcement] [--rebuild-catalog]\
- [--send-email] [--send-test-email] [-h|--help]\
-\
-Example:\
-\
-makedist-announcement milestone2 livecd\
+ echo $"Usage"": makedist-announcement distversion [mediumname] [--rebuild-announcement] [--rebuild-catalog]
+ [--send-email] [--send-test-email] [-h|--help]
+
+"$"Example"":
+makedist-announcement milestone2 livecd --send-test-email
"
exit 1
@@ -66,7 +64,7 @@ if [ "$mediumname" ]; then
it) export LC_ALL=it_IT.UTF8 ;;
*) echo "Error: unsupported language $outputlang; aborting."; exit 1 ;;
esac
- export $SCRIPT_ENV_ADD
+ [ "$SCRIPT_ENV_ADD" ] && export $SCRIPT_ENV_ADD
/usr/share/makedist/makedist-announcement.sh $distversion $mediumname $outputlang || exit 1
done
fi
@@ -78,11 +76,13 @@ fi
> $indexfile
for i in `seq 0 ${#MEDIA_NAME[*]}`; do
mediumdir=/var/ftp/pub/$distribution/media/$distversion/${MEDIA_NAME[i]}
+ echo -n "${MEDIA_NAME[i]} " >> $indexfile
for f in $mediumdir/info/release-announcement-*.$outputlang.html; do
[ -r $f ] || continue
version=`echo $f | sed "s|.*/release-announcement-\(.*\)\.$outputlang.html|\1|"`
- echo "${MEDIA_NAME[i]} ${version}
" >> $indexfile
+ echo "${version}" >> $indexfile
done
+ [ $i -lt ${#MEDIA_NAME[*]} ] && echo -n "
" >> $indexfile
done
done
#fi
diff --git a/config/20-makedist-autobuild b/config/20-makedist-autobuild
index 290355d..be5d611 100755
--- a/config/20-makedist-autobuild
+++ b/config/20-makedist-autobuild
@@ -114,24 +114,24 @@ LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=${MAKEDIST_FORCE} || {
[ "$RELEASE/pre" != "$RELEASE" ] && ln -sf buildinfo-$RELEASE.inc.html $DESTDIR/buildinfo-pre.inc.html
cd $DESTDIR
md5sum $DESTNAME > $DESTMD5
+ rm -f $DESTDIR/latest-is-*.txt
+ > $DESTLATEST
if [ "${DESTIMG/.iso}" != "$DESTIMG" ]; then
# ISO image, create video preview
[ ! -e $DESTDIR/preview/$DESTNAME.ogv -o $SOURCEIMG -nt $DESTDIR/preview/$DESTNAME.ogv ] && makedist-recordvm $DESTIMG
fi
- rm -f $DESTDIR/latest-is-*.txt
- > $DESTLATEST
else
[ -e $DESTDIR ] || mkdir -p $DESTDIR
cp $SOURCEIMG $DESTIMG
cp $SOURCEDIR/.${DESTFILENAME}.inc.html $DESTDIR/buildinfo.inc.html
cd $DESTDIR
md5sum $DESTNAME > $DESTMD5
+ rm -f $DESTDIR/latest-is-*.txt
+ > $DESTLATEST
if [ "${DESTIMG/.iso}" != "$DESTIMG" ]; then
# ISO image, create video preview
[ ! -e $DESTDIR/preview/$DESTNAME.ogv -o $SOURCEIMG -nt $DESTDIR/preview/$DESTNAME.ogv ] && makedist-recordvm $DESTIMG
fi
- rm -f $DESTDIR/latest-is-*.txt
- > $DESTLATEST
fi
fi
if [ "$DIST_CREATED" = "1" -o $DESTIMG -nt $DESTTORRENT -o \
@@ -269,7 +269,7 @@ _EOF
done
DIST_DWD="$DIST_DWD"
DIST_LINE="${MEDIA_NAME[$m]}"
- [ $DIST_CREATED ] && DIST_LINE="$DIST_LINE"
+ [ "$DIST_CREATED" = "1" ] && DIST_LINE="$DIST_LINE"
echo "${DIST_LINE}