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

diff --git a/my-debmirror b/my-debmirror
index 03c2048..7a3cc28 100755
--- a/my-debmirror
+++ b/my-debmirror
@@ -1,25 +1,12 @@
 #! /bin/sh
-DEB_MIRROR=${DEB_MIRROR:-ftp.de.debian.org}
-debmirror /mirror/debian -h "$DEB_MIRROR" --passive \
-	  --dist=sarge,sid \
-	  --section=main,contrib,non-free,main/debian-installer \
-	  --arch=i386,powerpc --getcontents \
-	  --ignore=^README --ignore=^non-US/ --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
-rsync -aqz "$DEB_MIRROR::debian/README*" /mirror/debian/
-for dir in doc indices tools; do
-	rsync -aqz "$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/" \
-			"/mirror/debian/dists/$dist/main/installer-$arch/"
-	done
-done
+set -e
+unset http_proxy
+DEB_MIRROR=${DEB_MIRROR:-ftp.se.debian.org}
+debmirror /mirror/debian -h "$DEB_MIRROR" --method http \
+	  --dist=wheezy,jessie,sid,experimental \
+	  --section=main,main/debian-installer \
+	  --arch=i386 --getcontents \
+	  --rsync-extra=doc,indices,tools,trace \
+	  --i18n \
+	  --exclude='i18n/Translation-' --include='i18n/Translation-en' \
+	  "$@"