Use ${file%.gz} instead of calling basename.

[dak.git] / config / debian-security / cron.daily

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index 3476d7db556f3e115d2171c89352b714ec26bdbc..8b05a3016669b7a4bcb97076a5442df1185da0a1 100755 (executable)
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -17,15 +17,15 @@ rsync --delete -r --include=override\* --exclude=\* --password-file /srv/securit
 
 cd $overridedir
 for file in override*.gz; do
-    zcat $file > $(basename $file .gz)
+    zcat -- "$file" > "${file%.gz}"
 done
 find . -maxdepth 1 -mindepth 1 -type l | xargs --no-run-if-empty rm
 
-for suite in stable testing; do
+for suite in oldstable stable testing; do
     case $suite in
-        oldstable) override_suite=squeeze;;
-        stable) override_suite=wheezy;;
-        testing) override_suite=jessie;;
+        oldstable) override_suite=wheezy  ;;
+        stable)    override_suite=jessie  ;;
+        testing)   override_suite=stretch ;;
         *) echo "Unknown suite type ($suite)"; exit 1;;
     esac
     for component in $components; do
@@ -50,21 +50,6 @@ for suite in stable testing; do
     done
 done
 
-# Generate .all3 overides for the buildd support
-for dist in squeeze wheezy jessie; do
-    rm -f override.$dist.all3
-    components="main contrib non-free";
-    if [ -f override.$dist.main.debian-installer.gz ]; then
-        components="$components main.debian-installer"
-    fi
-    for component in $components; do
-        zcat override.$dist.$component.gz >> override.$dist.all3
-        if [ -e "override.$dist.$component.src.gz" ]; then
-            zcat override.$dist.$component.src.gz >> override.$dist.all3.src
-        fi
-    done
-done
-
 ################################################################################
 
 cd $configdir