pull-mail: add --force option; extend running times

[bin.git] / my-debmirror

diff --git a/my-debmirror b/my-debmirror
index 458efc0f4666f37859c49ab7573a58b53e024b89..fd11f52e10c348fce5d27b00840edc684ad396ca 100755 (executable)
--- a/my-debmirror
+++ b/my-debmirror
@@ -1,8 +1,23 @@
-#! /bin/sh -e
+#! /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=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 i386; do
+               rsync -aqz --delete \
+                       "$DEB_MIRROR::debian/dists/$dist/main/installer-$arch/" \
+                       "/mirror/debian/dists/$dist/main/installer-$arch/"
+       done
+done