X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=cron.d%2F100syncarchive;h=01a2c4300b7d67e48a51ad7d1bc7b287dd6fd08d;hp=46da47ff17156c9194ddde657d85963f083df917;hb=c6fdd0f2653303fcc8a5307e106e77161f436b44;hpb=1f05205070c681dcdd3df2f03c430a98eafee540

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 46da47f..01a2c43 100755
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -15,32 +15,33 @@ then
         echo "retrieve Release(.gpg) $dist"
 	test -d us/${dist} || mkdir -p us/${dist}
 	(cd us/${dist} &&
-	    wget -q -N ${ftpsite}/dists/${dist}/Release &&
-	    wget -q -N ${ftpsite}/dists/${dist}/Release.gpg )
+	    $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
+	    test ! "$arch" = "kfreebsd-amd64" || 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
     done
 else
@@ -49,14 +50,14 @@ else
     do
         echo "retrieve Releases(.gpg) $dist"
 	test -d us/${dist} || mkdir -p us/${dist}
-	(cd us/${dist} &&
-	    rsync -t ${localdir}/dists/${dist}/Release &&
-	    rsync -t ${localdir}/dists/${dist}/Release.gpg )
+	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
+	    test ! "$arch" = "kfreebsd-amd64" || continue
 	    for part in ${parts}
 	    do
 	        echo retrieve Packages $dist/$part/$arch
@@ -80,43 +81,15 @@ else
     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)
-    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
-
 # security archive
 #
-for dist in oldstable stable testing
+for dist in sarge etch lenny
 do
     echo "retrieve Release(.gpg) $dist"
     test -d security/${dist} || mkdir -p security/${dist}
     (cd security/${dist} &&
-	wget -q -N ${security_ftpsite}/dists/${dist}/updates/Release &&
-	wget -q -N ${security_ftpsite}/dists/${dist}/updates/Release.gpg )
+	$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`
@@ -126,7 +99,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}
@@ -134,6 +107,6 @@ 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
 done