makedist-announcement: manage email addresses from configuration file and other small fixes

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 "<a href='?distrelease=${distversion}&medium=${MEDIA_NAME[i]}&version=${version}&lang=${outputlang}'>${MEDIA_NAME[i]} ${version}</a><br>" >> $indexfile
+            echo "<a href='?distrelease=${distversion}&medium=${MEDIA_NAME[i]}&version=${version}&lang=${outputlang}'>${version}</a>" >> $indexfile
          done
+         [ $i -lt ${#MEDIA_NAME[*]} ] && echo -n "<br>" >> $indexfile
       done
    done
 #fi