makedist-newrelease: use media name as --only option, not platform/subplatform

makedist-annoucement: small fixes applied during livecd-gnome release

bin/makedist-newrelease

@@ -6,10 +6,10 @@ echo
 function usage() 
 {
    echo "Usage:"
-   echo "makedist-newrelease release [distversion] [-f] [--only platform[/subplatform]]"
+   echo "makedist-newrelease release [distversion] [-f] [--only medium_name]"
    echo
    echo "-f: force full rebuild"
-   echo "--only: only build the specified platform and subplatform"
+   echo "--only: only build the specified medium"
    echo "-h: show this help and exit"
    echo
    echo "Example:"
@@ -26,9 +26,10 @@ function usage()
 while [ "$1" ]; do
    case $1 in
       -f) FORCE_ADD="FORCE=1" ;;
-      --only) ONLY_PLATFORM=$2
+      --only) ONLY_MEDIUM=$2
-              [ "$ONLY_PLATFORM" ] || {
+              [ "$ONLY_MEDIUM" ] || {
-                 echo "Error: platform must be specified after --only; aborting."
+                 echo "Error: medium name must be specified after --only; aborting."
+                 exit 1
               }
               shift ;;
       -h) usage; exit 0 ;;
@@ -38,7 +39,7 @@ while [ "$1" ]; do
       *) if [ ! "$RELEASE" ]; then
             RELEASE=$1
          elif [ ! "$DISTVERSION" ]; then
-            DISTVERSION=$2
+            DISTVERSION=$1
          else
             echo "Error: exceeding option $1; aborting."
             exit 1
@@ -49,7 +50,7 @@ while [ "$1" ]; do
 done
 
 [ "$RELEASE" ] || { usage; exit 1; }
-[ "$2" ] || DISTVERSION="milestone2"
+[ "$DISTVERSION" ] || DISTVERSION="milestone2"
 
 . /etc/sysconfig/makedist
 
@@ -57,14 +58,14 @@ echo "Releasing media for openmamba $DISTVERSION $RELEASE"
 
 ALLMEDIALAST=`expr ${#MEDIA_NAME[*]} - 1`
 for i in `seq 0 $ALLMEDIALAST`; do
-   PLATFORM=${MEDIA_PLATFORM[i]/\/*/}
+#   [ "$SUBPLATFORM" = "$PLATFORM" ] && SUBPLATFORM=
-   SUBPLATFORM=${MEDIA_SUBPLATFORM[i]/*\//}
+#   [ "${ONLY_PLATFORM/\//}" = "${ONLY_PLATFORM}" ] && ONLY_PLATFORM="$ONLY_PLATFORM/"
-   [ "$SUBPLATFORM" = "$PLATFORM" ] && SUBPLATFORM=
+   [ ! "$ONLY_MEDIUM" -o "$ONLY_MEDIUM" = "${MEDIA_NAME[i]}" ] || continue
-   [ "${ONLY_PLATFORM/\//}" = "${ONLY_PLATFORM}" ] && ONLY_PLATFORM="$ONLY_PLATFORM/"
+   PLATFORM=${MEDIA_PLATFORM[i]}
-   [ ! "$ONLY_PLATFORM" -o "$ONLY_PLATFORM" = "$PLATFORM/$SUBPLATFORM" ] || continue
+   SUBPLATFORM=${MEDIA_SUBPLATFORM[i]}
    for lang in ${MEDIA_LANGUAGES[i]}; do
       for arch in ${MEDIA_ARCHS[i]}; do
-         sudo makedist openmamba-$DISTVERSION PLATFORM=$PLATFORM SUBPLATFORM=$SUBPLATFORM LANGUAGE=$lang RELEASE=$DISTVERSION ARCH=$arch $FORCE_ADD || {
+            sudo makedist openmamba-$DISTVERSION PLATFORM=$PLATFORM SUBPLATFORM=$SUBPLATFORM LANGUAGE=$lang RELEASE=$DISTVERSION ARCH=$arch $FORCE_ADD || {
             echo "Error: fatal error running 'makedist openmamba-$DISTVERSION PLATFORM=$PLATFORM SUBPLATFORM=$SUBPLATFORM LANGUAGE=$lang RELEASE=$DISTVERSION ARCH=$arch $FORCE_ADD'; aborting."
             exit 1
          }
@@ -77,8 +78,8 @@ for i in `seq 0 $ALLMEDIALAST`; do
    DISTVERSION=$DISTVERSION /etc/cron.daily/20-openmamba-autobuild-makedist
 done
 
-# Workaround: updates home page HTML which always show previous version after first run
+## Workaround: updates home page HTML which always show previous version after first run
-RELEASE=$RELEASE \
+#RELEASE=$RELEASE \
-DISTVERSION=$DISTVERSION \
+#DISTVERSION=$DISTVERSION \
-/etc/cron.daily/20-openmamba-autobuild-makedist
+#/etc/cron.daily/20-openmamba-autobuild-makedist
 exit 0

makedist/makedist-announcement.sh

@@ -198,7 +198,7 @@ function print_group() {
       return 1
    }
 
-   grep " $searchgroup " $catalogfile | \
+   grep " $searchgroup " $catalogfile | sort -u | \
    while read line; do
       set -- $line
       get_pkg_buildinfo $buildinfourl $mediumarch $1
@@ -404,7 +404,7 @@ $distribution-$mediumname-$l-$mediadistversion-$version.${mediumarch}.${medium_s
    print_pkg_line X.org xorg-server
    print_pkg_line Mesa Mesa
    print_pkg_line KDE kde-workspace
-   print_pkg_line GNOME gnome-session
+   print_pkg_line GNOME gnome-desktop
    print_pkg_line LXDE lxde-common
    block_end $"Graphical and Desktop environment"
 
@@ -466,6 +466,8 @@ $distribution-$mediumname-$l-$mediadistversion-$version.${mediumarch}.${medium_s
    echo -n "</div><hr><p><i>"$"Announcement automatically generated by"" makedist-announcement $VERSION " >> $outputfile
    if [ "$distversion" != "devel" ]; then
       echo $"and signed off by"" $signer</i>" >> $outputfile
+   else
+      echo >> $outputfile
    fi
 #gpg --clearsign $outputfile > $outputfile.sig
 
@@ -506,7 +508,7 @@ if [ "$SENDEMAIL" -o "$SENDTESTEMAIL" ]; then
    fi
 
    for a in $SENDADDRESSES; do
-      if [[ "`/usr/bin/tty`" != "not a tty" ]]; then
+      if [[ "`LC_ALL=C /usr/bin/tty`" != "not a tty" ]]; then
          echo -n $"Send english ($outputlang) language email to $a for ""'$distribution $distversion ${MEDIA_NAME[i]} $version' [y/N]?"
          read ans
       else

po/it/messages.po

@@ -34,7 +34,7 @@ msgid ""
 "$distversion $version</b> release of the $distribution <b>${MEDIA_NAME[i]}</"
 "b> distribution."
 msgstr ""
-"Il manutentore di $distribution &egrave; annuncia la disponibilit&agrave; "
+"Il manutentore di $distribution annuncia la disponibilit&agrave; "
 "della versione <b>$distversion $version</b> della distribuzione "
 "$distribution <b>${MEDIA_NAME[i]}</b>."