makedist-announcement: improve support for snapshot targets and add command line interface options

bin/makedist-announcement

@@ -10,21 +10,43 @@ distribution="openmamba"
 TEXTDOMAIN="makedist"; export TEXTDOMAIN
 
 function usage() {
-   echo "Usage: makedist-announcement distversion [mediumname]
-
-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\
 "
 
    exit 1
 
 }
 
-[ "$1" ] || usage
+while [ "$1" ]; do
+   case $1 in
+      --rebuild-announcement) SCRIPT_ENV_ADD="$SCRIPT_ENV_ADD REBUILDANNOUNCEMENT=1" ;;
+      --rebuild-catalog) SCRIPT_ENV_ADD="$SCRIPT_ENV_ADD REBUILDCATALOG=1" ;;
+      --send-email) SCRIPT_ENV_ADD="$SCRIPT_ENV_ADD SENDEMAIL=1" ;;
+      --send-test-email) SCRIPT_ENV_ADD="$SCRIPT_ENV_ADD SENDTESTEMAIL=1" ;;
+      -h|--help) usage; exit 0 ;;
+      -*) echo "Error: uknown option $1; aborting."
+          exit 1
+          ;;
+      *) if [ ! "$distversion" ]; then
+            distversion=$1
+         elif [ ! "$mediumname" ]; then
+            mediumname=$1
+         else
+            echo "Error: exceeding option $1; aborting."
+            exit 1
+         fi
+         ;;
+   esac
+   shift
+done
 
-distversion=$1
-mediumname=$2
+[ "$distversion" ] || usage
 
 if [ "$distversion" != "devel" ]; then
    RELEASE=1
@@ -44,11 +66,12 @@ if [ "$mediumname" ]; then
          it) export LC_ALL=it_IT.UTF8 ;;
          *) echo "Error: unsupported language $outputlang; aborting."; exit 1 ;;
       esac
+      export $SCRIPT_ENV_ADD
       /usr/share/makedist/makedist-announcement.sh $distversion $mediumname $outputlang || exit 1
    done
 fi
 
-if [ ! "$SENDEMAIL" -a ! "$SENDTESTEMAIL" ]; then
+#if [ ! "$SENDEMAIL" -a ! "$SENDTESTEMAIL" ]; then
    echo $"Generating $distversion announcements index"
    for outputlang in $outputlangs; do
       indexfile=/var/ftp/pub/$distribution/media/$distversion/release-announcement-index.$outputlang.html.inc
@@ -62,4 +85,4 @@ if [ ! "$SENDEMAIL" -a ! "$SENDTESTEMAIL" ]; then
          done
       done
    done
-fi
+#fi