X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=blobdiff_plain;f=my-debmirror;h=3e00327027a239fd190b5eaf194a9d914c48d255;hb=refs%2Fheads%2Fmaster;hp=79ce8c6b79b5f3710eda23995ac6df81436e172c;hpb=6608e47387b8857e35bb84b8704d3f95a95eb2d7;p=bin.git

diff --git a/my-debmirror b/my-debmirror
index 79ce8c6..3e00327 100755
--- a/my-debmirror
+++ b/my-debmirror
@@ -1,8 +1,13 @@
 #! /bin/sh
-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 "$@"
+set -e
+unset http_proxy
+DEB_MIRROR=${DEB_MIRROR:-ftp.uk.debian.org}
+debmirror /mirror/debian -h "$DEB_MIRROR" --method http \
+	  --dist=buster,bullseye,sid,experimental \
+	  --section=main,main/debian-installer \
+	  --arch=amd64 --getcontents \
+	  --rsync-extra=doc,indices,tools,trace \
+	  --i18n \
+	  --keyring=/usr/share/keyrings/debian-archive-keyring.gpg \
+	  --exclude='i18n/Translation-' --include='i18n/Translation-en' \
+	  "$@"