etc/mirrors.d/*: Use the new `MIRRORS' variable.

Better than hardcoding the location.  Also, in .../50-rfc, change
current directory rather than writing the destination in full each
time.

diff --git a/etc/mirrors.d/50-mirror b/etc/mirrors.d/50-mirror
index da23848..a65823d 100755 (executable)
--- a/etc/mirrors.d/50-mirror
+++ b/etc/mirrors.d/50-mirror
@@ -3,5 +3,5 @@
 ### Lee MacLoughlin's mirror scripts.
 
 here=$(pwd)
-cd /mnt/ftp/pub/mirrors
+cd $MIRRORS
 mirror -d "$@" "$here"/etc/mirror.packages

diff --git a/etc/mirrors.d/50-rfc b/etc/mirrors.d/50-rfc
index 0c7200c..e44e1d4 100755 (executable)
--- a/etc/mirrors.d/50-rfc
+++ b/etc/mirrors.d/50-rfc
@@ -3,12 +3,17 @@
 ### Mirror RFCs and Internet Drafts from mirrorservice.org
 
 . lib/functions.sh
+cd $MIRRORS
+
+## Fetch the RFC collection.
 standard_rsync "$@" \
   --exclude /ien/scanned/ \
   --exclude /tar/ \
   --exclude /internet-drafts/ \
   www.ietf.org::everything-ftp/rfc/ \
-  /mnt/ftp/pub/mirrors/rfc/
+  rfc/
+
+## Fetch the Internet Draft collection.
 standard_rsync "$@" \
   rsync.mirrorservice.org::ftp.isi.edu/internet-drafts/ \
-  /mnt/ftp/pub/mirrors/internet-drafts/
+  internet-drafts/