Minor changes sync with current makedist server

This commit is contained in:
Silvan Calarco 2016-10-21 20:53:47 +02:00
parent 7b796fbca8
commit 6c65e4efee
5 changed files with 44 additions and 15 deletions

View File

@ -1,6 +1,6 @@
#!/bin/bash
# makedist-announcement
# Copyright (c) 2012-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
# Copyright (c) 2012-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
#
. /usr/share/makedist/VERSION

View File

@ -74,7 +74,7 @@ for m in $MILESTONES; do
fi
done
# echo
# ls --sort=time $d/*.iso $d/*.cpio.gz
# ls --sort=time $d/*.iso $d/*.cpio.gz
#find $DESTBASEDIR -name *.iso
done
done

View File

@ -20,7 +20,6 @@ REPOSITORY=(
/var/ftp/pub/openmamba/devel
/var/ftp/pub/openmamba/devel-games
)
#/var/ftp/pub/openmamba/devel-makedist
else
REPOSITORY=(
/var/ftp/pub/openmamba/devel

View File

@ -9,7 +9,7 @@ HTML_LANGS="it en"
MAKEDIST_CRON_ENABLE=1
# announcements configuration
ANNOUNCEMENTS_SIGNER="Silvan Calarco"
#ANNOUNCEMENTS_SIGNER="Silvan Calarco"
ANNOUNCEMENTS_EMAILS_TEST="test@openmamba.org"
ANNOUNCEMENTS_EMAILS_STABLE_EN="openmamba-users@openmamba.org openmamba-devel@openmamba.org distro@distrowatch.com"
ANNOUNCEMENTS_EMAILS_STABLE_IT="openmamba-users-it@openmamba.org openmamba-devel-it@openmamba.org"
@ -219,7 +219,7 @@ else
MEDIA_VARIANT[0]=
MEDIA_LANGUAGES[0]="it en es"
MEDIA_ARCHS[0]="i586 x86_64"
MEDIA_WEEKDAY[0]=1
MEDIA_WEEKDAY[0]=2
MEDIA_MILESTONE[1]=devel
MEDIA_NAME[1]=livedvd
@ -229,7 +229,7 @@ else
MEDIA_VARIANT[1]=
MEDIA_LANGUAGES[1]="en"
MEDIA_ARCHS[1]="i586 x86_64"
MEDIA_WEEKDAY[1]=2
MEDIA_MONTHDAY[1]=19
MEDIA_MILESTONE[2]=devel
MEDIA_NAME[2]=livecd-light
@ -239,7 +239,7 @@ else
MEDIA_VARIANT[2]=
MEDIA_LANGUAGES[2]="it en es"
MEDIA_ARCHS[2]="i586 x86_64"
MEDIA_WEEKDAY[2]=3
MEDIA_WEEKDAY[2]=7
MEDIA_MILESTONE[3]=devel
MEDIA_NAME[3]=livecd-gnome
@ -249,7 +249,7 @@ else
MEDIA_VARIANT[3]=
MEDIA_LANGUAGES[3]="it en es"
MEDIA_ARCHS[3]="i586 x86_64"
MEDIA_WEEKDAY[3]=4
MEDIA_MONTHDAY[3]=23
MEDIA_MILESTONE[4]=devel
MEDIA_NAME[4]=testcd
@ -259,7 +259,7 @@ else
MEDIA_VARIANT[4]=
MEDIA_LANGUAGES[4]="it en es"
MEDIA_ARCHS[4]="x86_64"
MEDIA_WEEKDAY[4]=8
MEDIA_MONTHDAY[4]=99
MEDIA_MILESTONE[5]=devel
MEDIA_NAME[5]=rootfs
@ -269,7 +269,7 @@ else
MEDIA_VARIANT[5]=
MEDIA_LANGUAGES[5]="it en es"
MEDIA_ARCHS[5]="arm i586 x86_64"
MEDIA_MONTHDAY[5]=15
MEDIA_MONTHDAY[5]=25
MEDIA_MILESTONE[6]=devel
MEDIA_NAME[6]=rootfs-light
@ -299,7 +299,7 @@ else
MEDIA_VARIANT[8]=raspberrypi
MEDIA_LANGUAGES[8]="it en es"
MEDIA_ARCHS[8]="arm"
MEDIA_MONTHDAY[8]=21
MEDIA_MONTHDAY[8]=18
MEDIA_MILESTONE[9]=devel
MEDIA_NAME[9]=diskimg-livecd
@ -309,7 +309,7 @@ else
MEDIA_VARIANT[9]=livecd
MEDIA_LANGUAGES[9]="it en es"
MEDIA_ARCHS[9]="x86_64 i586"
MEDIA_WEEKDAY[9]=2
MEDIA_WEEKDAY[9]=5
MEDIA_MILESTONE[10]=devel
MEDIA_NAME[10]=diskimg-cubox
@ -329,7 +329,7 @@ else
MEDIA_VARIANT[11]=
MEDIA_LANGUAGES[11]="it en es"
MEDIA_ARCHS[11]="i586 x86_64"
MEDIA_MONTHDAY[11]=8
MEDIA_MONTHDAY[11]=118
MEDIA_MILESTONE[12]=devel
MEDIA_NAME[12]=rootfs-base
@ -339,6 +339,36 @@ else
MEDIA_VARIANT[12]=
MEDIA_LANGUAGES[12]="en"
MEDIA_ARCHS[12]="arm i586 x86_64"
MEDIA_MONTHDAY[12]=14
MEDIA_MONTHDAY[12]=114
MEDIA_MILESTONE[13]=milestone3
MEDIA_NAME[13]=livedvd
MEDIA_TARGET[13]=openmamba
MEDIA_PLATFORM[13]=livedvd
MEDIA_SUBPLATFORM[13]=livedvd-root
MEDIA_VARIANT[13]=
MEDIA_LANGUAGES[13]="en"
MEDIA_ARCHS[13]="i586 x86_64"
MEDIA_MONTHDAY[13]=119
MEDIA_MILESTONE[14]=milestone3
MEDIA_NAME[14]=diskimg-livecd
MEDIA_TARGET[14]=openmamba
MEDIA_PLATFORM[14]=diskimg
MEDIA_SUBPLATFORM[14]=
MEDIA_VARIANT[14]=livecd
MEDIA_LANGUAGES[14]="it en es"
MEDIA_ARCHS[14]="x86_64 i586"
MEDIA_MONTHDAY[14]=120
MEDIA_MILESTONE[15]=milestone3
MEDIA_NAME[15]=livecd-light
MEDIA_TARGET[15]=openmamba
MEDIA_PLATFORM[15]=livecd
MEDIA_SUBPLATFORM[15]=livecd-light-root
MEDIA_VARIANT[15]=
MEDIA_LANGUAGES[15]="it en es"
MEDIA_ARCHS[15]="i586 x86_64"
MEDIA_MONTHDAY[15]=120
fi

View File

@ -496,7 +496,7 @@ _EOF
" >> $outputfile
echo -n "</div><hr><p><i>"$"Announcement automatically generated by"" makedist $makedist_version " >> $outputfile
if [ "$distversion" != "devel" ]; then
if [ "$distversion" != "devel" -a "$ANNOUNCEMENTS_SIGNER" ]; then
echo $"and signed off by"" $ANNOUNCEMENTS_SIGNER</i>" >> $outputfile
else
echo >> $outputfile