From d50fe5ad004d74ed5bd9add646964478c9d1e257 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Mon, 7 Aug 2023 13:17:27 +0200
Subject: [PATCH] makedist-announcement: fix after media distversion switch
 from devel to rolling

---
 bin/makedist-announcement         |  4 ++--
 makedist/makedist-announcement.sh | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/bin/makedist-announcement b/bin/makedist-announcement
index 0fcbfba..84257d5 100755
--- a/bin/makedist-announcement
+++ b/bin/makedist-announcement
@@ -1,6 +1,6 @@
 #!/bin/bash
 # makedist-announcement
-# Copyright (c) 2012-2020 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2012-2023 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 
 . /usr/share/makedist/VERSION
@@ -48,7 +48,7 @@ done
 
 [ "$distversion" ] || usage
 
-if [ "$distversion" != "devel" ]; then
+if [ "$distversion" != "rolling" ]; then
    RELEASE=1
    DISTVERSION=$distversion
 else
diff --git a/makedist/makedist-announcement.sh b/makedist/makedist-announcement.sh
index 635e51a..b22f657 100755
--- a/makedist/makedist-announcement.sh
+++ b/makedist/makedist-announcement.sh
@@ -57,7 +57,7 @@ case $outputlang in
    *) announcementdate=`date +%m/%d/%Y` ;;
 esac
 
-if [ "$distversion" != "devel" ]; then
+if [ "$distversion" != "rolling" ]; then
    RELEASE=1
    DISTVERSION=$distversion
    MAKEDIST_TARGET=$distribution-$distversion
@@ -69,7 +69,7 @@ else
    MAKEDIST_TARGET=$distribution
    buildinfourl=/var/ftp/pub/$distribution/distromatic/devel-makedist
    pkginforep=$distversion-makedist
-   mediadistversion=$distversion
+   mediadistversion=snapshot
 fi
 
 . /etc/sysconfig/makedist
@@ -261,8 +261,6 @@ mediumvariant=${MEDIA_VARIANT[i]}
 webmediumdir=pub/$distribution/media/$distversion/$mediumname
 mediumdir=/var/ftp/$webmediumdir
 
-#[ "$distversion" = "devel" ] && fallbackmediumdir=/var/ftp/pub/$distribution/media/milestone2/$mediumname
-
 if [ $mediumsubplatform ]; then
    . /var/makedist/targets/$MAKEDIST_TARGET/platforms/$mediumsubplatform/settings.inc
    medium_name=`arch=_SPLIT_ VARIANT=$mediumvariant PLATFORM=$mediumsubplatform media_name`
@@ -404,7 +402,7 @@ $distribution-$mediumname-$l-$mediadistversion-$version.${a}.${medium_suffix}</a
    fi
    echo -n "</ul>" >> $outputfile
 
-   :<< _EOF
+:<< _EOF
    block_start
    for a in ${MEDIA_ARCHS[i]}; do
       print_pkg_line $"Linux kernel ($a)" kernel $a
@@ -479,7 +477,7 @@ $distribution-$mediumname-$l-$mediadistversion-$version.${a}.${medium_suffix}</a
 _EOF
 
    echo "<h3>"$"Links""</h3><ul>" >> $outputfile
-   :<< _EOF
+
    echo "<li><a href='http://$siteaddress/distribution/media/${MEDIA_NAME[i]}.html?lang=$outputlang'>\
 "$"${MEDIA_NAME[i]} page at $siteaddress""</a>" >> $outputfile
    echo "\