X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=my-debmirror;h=907ca7ce4d334ba1bab4db1228f8f42e99294ec4;hp=03c204803ed43f6f25a0ebaa115a9b0620c6e18e;hb=b23e5ac63cd89de140fff2a005ea30d6ee5d8297;hpb=7eafaa5fad9f2bc34f130d404b14f58b5d2a360a

diff --git a/my-debmirror b/my-debmirror
index 03c2048..907ca7c 100755
--- a/my-debmirror
+++ b/my-debmirror
@@ -1,25 +1,23 @@
 #! /bin/sh
+set -e
 DEB_MIRROR=${DEB_MIRROR:-ftp.de.debian.org}
-debmirror /mirror/debian -h "$DEB_MIRROR" --passive \
-	  --dist=sarge,sid \
+debmirror /mirror/debian -h "$DEB_MIRROR" --method http \
+	  --dist=lenny,squeeze,sid \
 	  --section=main,contrib,non-free,main/debian-installer \
-	  --arch=i386,powerpc --getcontents \
-	  --ignore=^README --ignore=^non-US/ --ignore=^doc/ \
+	  --arch=amd64,i386 --getcontents \
+	  --ignore=^README --ignore=^doc/ \
 	  --ignore=^indices/ --ignore=^tools/ --ignore=main/installer- "$@"
-debmirror /mirror/debian/non-US -h "$DEB_MIRROR" -r /debian-non-US --passive \
-	  --dist=sarge/non-US,sid/non-US \
-	  --arch=i386,powerpc --getcontents "$@"
-ln -sf sarge /mirror/debian/dists/testing
-ln -sf sid /mirror/debian/dists/unstable
-ln -sf sarge /mirror/debian/non-US/dists/testing
-ln -sf sid /mirror/debian/non-US/dists/unstable
+ln -nsf lenny /mirror/debian/dists/stable
+ln -nsf squeeze /mirror/debian/dists/testing
+ln -nsf sid /mirror/debian/dists/unstable
 rsync -aqz "$DEB_MIRROR::debian/README*" /mirror/debian/
 for dir in doc indices tools; do
-	rsync -aqz "$DEB_MIRROR::debian/$dir/" "/mirror/debian/$dir/"
+	rsync -aqz --delete "$DEB_MIRROR::debian/$dir/" "/mirror/debian/$dir/"
 done
-for dist in sarge sid; do
-	for arch in i386 powerpc; do
-		rsync -aqz "$DEB_MIRROR::debian/dists/$dist/main/installer-$arch/" \
+for dist in lenny squeeze sid; do
+	for arch in amd64 i386; do
+		rsync -aqz --delete \
+			"$DEB_MIRROR::debian/dists/$dist/main/installer-$arch/" \
 			"/mirror/debian/dists/$dist/main/installer-$arch/"
 	done
 done