Typo fix.

[deb/packages.git] / cron.d / 100syncarchive

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 5b534763f17842491b094f8e2a5da99105ed1925..d8b9f79bc28b8248fd63b67c1c2af7d6068bd5e1 100755 (executable)
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -12,39 +12,49 @@ then
     echo using remote mirror
     for dist in $dists
     do
+        echo "retrieve Release(.gpg) $dist"
+       test -d us/${dist} || mkdir -p us/${dist}
+       (cd us/${dist} &&
+           $wget_cmd -N ${ftpsite}/dists/${dist}/Release &&
+           $wget_cmd -N ${ftpsite}/dists/${dist}/Release.gpg )
+        
        foo=\$arch_${dist//-/_}
        for arch in `eval echo $foo`
        do
-           test ! "$arch" = "kfreebsd-i386" || continue
            for part in ${parts}
            do
                echo retrieve Packages $dist/$part/$arch
                test -d us/${dist}/${part}/binary-${arch} || mkdir -p us/${dist}/${part}/binary-${arch}
                (cd us/${dist}/${part}/binary-${arch} &&
-                   wget -q -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
+                   $wget_cmd -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
            done
            #FIXME: no Contents files for p-u
-           test ! "$dist" = "experimental" || continue
            echo retrieve Contents $dist/$arch
            (cd us/${dist} &&
-               wget -q -N ${ftpsite}/dists/${dist}/Contents-${arch}.gz)
+               $wget_cmd -N ${ftpsite}/dists/${dist}/Contents-${arch}.gz)
        done
        for part in ${parts}
        do
            echo retrieve Sources $dist/$part
            test -d us/${dist}/${part}/source || mkdir -p us/${dist}/${part}/source
             (cd us/${dist}/${part}/source &&
-                wget -q -N ${ftpsite}/dists/${dist}/${part}/source/Sources.gz)
+                $wget_cmd -N ${ftpsite}/dists/${dist}/${part}/source/Sources.gz)
        done
+
+       $check_release_cmd $archivedir/us/${dist}/Release
     done
 else
     echo using local mirror
     for dist in $dists
     do
+        echo "retrieve Releases(.gpg) $dist"
+       test -d us/${dist} || mkdir -p us/${dist}
+       rsync -t ${localdir}/dists/${dist}/Release us/${dist}/Release
+       rsync -t ${localdir}/dists/${dist}/Release.gpg us/${dist}/Release.gpg
+
        foo=\$arch_${dist//-/_}
        for arch in `eval echo $foo`
        do
-           test ! "$arch" = "kfreebsd-i386" || continue
            for part in ${parts}
            do
                echo retrieve Packages $dist/$part/$arch
@@ -53,7 +63,6 @@ else
                    us/${dist}/${part}/binary-${arch}/Packages.gz
            done
            #FIXME: no Contents files for p-u
-           test ! "$dist" = "experimental" || continue
            echo retrieve Contents $dist/$arch
            rsync -t ${localdir}/dists/${dist}/Contents-${arch}.gz \
                us/${dist}/Contents-${arch}.gz
@@ -65,41 +74,21 @@ else
             rsync -t ${localdir}/dists/${dist}/${part}/source/Sources.gz \
                us/${dist}/${part}/source/Sources.gz
        done
-    done
-fi
 
-# Non-US archive
-#
-for dist in oldstable
-do
-    foo=\$arch_${dist//-/_}
-    for arch in `eval echo $foo`
-    do
-       for part in ${parts}
-       do
-           echo retrieve Packages $dist/$part/non-US/$arch
-           test -d non-US/${dist}/${part}/binary-${arch} || mkdir -p non-US/${dist}/${part}/binary-${arch}
-           (cd non-US/${dist}/${part}/binary-${arch} &&
-               wget -q -N ${nonus_ftpsite}/dists/${dist}/non-US/${part}/binary-${arch}/Packages.gz)
-       done
-       #FIXME: no Contents files for p-u
-       echo retrieve Contents $dist/non-US/$arch
-       (cd non-US/${dist} &&
-           wget -q -N ${nonus_ftpsite}/dists/${dist}/non-US/Contents-${arch}.gz)
+       $check_release_cmd $archivedir/us/${dist}/Release
     done
-    for part in ${parts}
-    do
-        echo retrieve Sources $dist/$part/non-US
-       test -d non-US/${dist}/${part}/source || mkdir -p non-US/${dist}/${part}/source
-       (cd non-US/${dist}/${part}/source &&
-           wget -q -N ${nonus_ftpsite}/dists/${dist}/non-US/${part}/source/Sources.gz)
-    done
-done
+fi
 
 # security archive
 #
-for dist in oldstable stable testing
+for dist in etch lenny
 do
+    echo "retrieve Release(.gpg) $dist"
+    test -d security/${dist} || mkdir -p security/${dist}
+    (cd security/${dist} &&
+       $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/Release &&
+       $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/Release.gpg )
+        
     foo=\$arch_${dist//-/_}
     for arch in `eval echo $foo`
     do
@@ -108,7 +97,7 @@ do
        echo retrieve Packages $dist/$part/security/$arch
        test -d security/${dist}/${part}/binary-${arch} || mkdir -p security/${dist}/${part}/binary-${arch}
        (cd  security/${dist}/${part}/binary-${arch} &&
-           wget -q -N ${security_ftpsite}/dists/${dist}/updates/${part}/binary-${arch}/Packages.gz)
+           $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/${part}/binary-${arch}/Packages.gz)
       done
     done
     for part in ${parts}
@@ -116,6 +105,8 @@ do
         echo retrieve Sources $dist/$part/security
         test -d security/${dist}/${part}/source || mkdir -p security/${dist}/${part}/source
         (cd security/${dist}/${part}/source &&
-            wget -q -N ${security_ftpsite}/dists/${dist}/updates/${part}/source/Sources.gz)
+            $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/${part}/source/Sources.gz)
     done
+
+    $check_release_cmd $archivedir/security/${dist}/Release
 done