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

diff --git a/my-debmirror b/my-debmirror
index 79ce8c6..907ca7c 100755
--- a/my-debmirror
+++ b/my-debmirror
@@ -1,8 +1,23 @@
 #! /bin/sh
+set -e
 DEB_MIRROR=${DEB_MIRROR:-ftp.de.debian.org}
-debmirror /mirror/debian -h "$DEB_MIRROR" --passive \
-	  --nosource --section=main,contrib,non-free,main/debian-installer \
-	  --getcontents --ignore=non-US/ "$@" 2>&1 >/dev/null | \
-	  grep -v 'debian-installer.*Release' 1>&2
-debmirror /mirror/debian/non-US -h "$DEB_MIRROR" -r /debian-non-US --passive \
-	  --nosource -d unstable/non-US --getcontents "$@"
+debmirror /mirror/debian -h "$DEB_MIRROR" --method http \
+	  --dist=lenny,squeeze,sid \
+	  --section=main,contrib,non-free,main/debian-installer \
+	  --arch=amd64,i386 --getcontents \
+	  --ignore=^README --ignore=^doc/ \
+	  --ignore=^indices/ --ignore=^tools/ --ignore=main/installer- "$@"
+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 --delete "$DEB_MIRROR::debian/$dir/" "/mirror/debian/$dir/"
+done
+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