From b059fd4fedc71b84aebcd54fa4ba898ba73c9f7c Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Wed, 10 Aug 2022 11:05:54 +0200 Subject: [PATCH] 30-makedist-autobuild-cleanold: parametrize hardcoded openmamba entries --- config/30-makedist-autobuild-cleanold | 11 +++++------ config/makedist | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/config/30-makedist-autobuild-cleanold b/config/30-makedist-autobuild-cleanold index 57c0387..343c71b 100755 --- a/config/30-makedist-autobuild-cleanold +++ b/config/30-makedist-autobuild-cleanold @@ -1,29 +1,26 @@ #!/bin/bash # # Makedist automatic clean script -# Copyright (c) 2007-2015 by Silvan Calarco +# Copyright (c) 2007-2022 by Silvan Calarco # . /etc/sysconfig/makedist [ "$MAKEDIST_CRON_ENABLE" = "1" ] || exit 0 SOURCEDIR=/var/makedist -MILESTONES="milestone3 milestone2 devel" -DESTBASEURL=/pub/openmamba/devel/media [ "$TODAYDATE" ] || TODAYDATE=`date +%Y%m%d` -GLOBDOWNLOADSFILE=$DESTBASEDIR/downloads.inc LANGS="it en es" ARCHS="i586 arm x86_64 aarch64" tmpfile=`mktemp` -[ $tmpfile ] || { +[ "$tmpfile" ] || { echo "Error: cannot create temporary files; aborting." exit 1 } for m in $MILESTONES; do - DESTBASEDIR=/var/ftp/pub/openmamba/$m/media + DESTBASEDIR=${REPODIR_LOCAL}/$m/media for l in $LANGS; do for d in `find $DESTBASEDIR/*/$l -maxdepth 0 -type d`; do for a in $ARCHS; do @@ -80,3 +77,5 @@ for m in $MILESTONES; do done done done + +[ -e $tmpfile ] && rm -f $tmpfile diff --git a/config/makedist b/config/makedist index 7773e9d..8684e4e 100644 --- a/config/makedist +++ b/config/makedist @@ -2,9 +2,9 @@ # makedist automatic build global configuration # - REPODIR_LOCAL="/var/ftp/pub/openmamba" REPODIR_URL="/pub/openmamba" +MILESTONES="milestone3 milestone2 devel" PROJECTURL=https://openmamba.org #TORRENTURL=http://torrent.mambasoft.it:8080/announce