openmamba/makedist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makedist-announcement: fix after media distversion switch from devel to rolling

Browse Source
This commit is contained in:
Silvan Calarco 2023-08-07 13:17:27 +02:00
parent 29bc94e68b
commit d50fe5ad00
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/makedist-announcement
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# makedist-announcement # 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 . /usr/share/makedist/VERSION
@ -48,7 +48,7 @@ done
[ "$distversion" ] || usage [ "$distversion" ] || usage
if [ "$distversion" != "devel" ]; then if [ "$distversion" != "rolling" ]; then
RELEASE=1 RELEASE=1
DISTVERSION=$distversion DISTVERSION=$distversion
else else

10
makedist/makedist-announcement.sh
View File

@ -57,7 +57,7 @@ case $outputlang in
*) announcementdate=`date +%m/%d/%Y` ;; *) announcementdate=`date +%m/%d/%Y` ;;
esac esac
if [ "$distversion" != "devel" ]; then if [ "$distversion" != "rolling" ]; then
RELEASE=1 RELEASE=1
DISTVERSION=$distversion DISTVERSION=$distversion
MAKEDIST_TARGET=$distribution-$distversion MAKEDIST_TARGET=$distribution-$distversion
@ -69,7 +69,7 @@ else
MAKEDIST_TARGET=$distribution MAKEDIST_TARGET=$distribution
buildinfourl=/var/ftp/pub/$distribution/distromatic/devel-makedist buildinfourl=/var/ftp/pub/$distribution/distromatic/devel-makedist
pkginforep=$distversion-makedist pkginforep=$distversion-makedist
mediadistversion=$distversion mediadistversion=snapshot
fi fi
. /etc/sysconfig/makedist . /etc/sysconfig/makedist
@ -261,8 +261,6 @@ mediumvariant=${MEDIA_VARIANT[i]}
webmediumdir=pub/$distribution/media/$distversion/$mediumname webmediumdir=pub/$distribution/media/$distversion/$mediumname
mediumdir=/var/ftp/$webmediumdir mediumdir=/var/ftp/$webmediumdir
#[ "$distversion" = "devel" ] && fallbackmediumdir=/var/ftp/pub/$distribution/media/milestone2/$mediumname
if [ $mediumsubplatform ]; then if [ $mediumsubplatform ]; then
. /var/makedist/targets/$MAKEDIST_TARGET/platforms/$mediumsubplatform/settings.inc . /var/makedist/targets/$MAKEDIST_TARGET/platforms/$mediumsubplatform/settings.inc
medium_name=`arch=_SPLIT_ VARIANT=$mediumvariant PLATFORM=$mediumsubplatform media_name` medium_name=`arch=_SPLIT_ VARIANT=$mediumvariant PLATFORM=$mediumsubplatform media_name`
@ -404,7 +402,7 @@ $distribution-$mediumname-$l-$mediadistversion-$version.${a}.${medium_suffix}</a
fi fi
echo -n "</ul>" >> $outputfile echo -n "</ul>" >> $outputfile
:<< _EOF :<< _EOF
block_start block_start
for a in ${MEDIA_ARCHS[i]}; do for a in ${MEDIA_ARCHS[i]}; do
print_pkg_line $"Linux kernel ($a)" kernel $a print_pkg_line $"Linux kernel ($a)" kernel $a
@ -479,7 +477,7 @@ $distribution-$mediumname-$l-$mediadistversion-$version.${a}.${medium_suffix}</a
_EOF _EOF
echo "<h3>"$"Links""</h3><ul>" >> $outputfile echo "<h3>"$"Links""</h3><ul>" >> $outputfile
:<< _EOF
echo "<li><a href='http://$siteaddress/distribution/media/${MEDIA_NAME[i]}.html?lang=$outputlang'>\ echo "<li><a href='http://$siteaddress/distribution/media/${MEDIA_NAME[i]}.html?lang=$outputlang'>\
"$"${MEDIA_NAME[i]} page at $siteaddress""</a>" >> $outputfile "$"${MEDIA_NAME[i]} page at $siteaddress""</a>" >> $outputfile
echo "\ echo "\