X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fupdate-mirrorlists;h=a711d8a624c82c23e63451ae0c4ce223f040531b;hb=35b109fe6f42b6853809151e73be96909af7e3f7;hp=b68a870cd6714a6cf6d55ad2de91711d49084757;hpb=59fd5aa2a8be3b76dbc968429c457f096adfa472;p=dak.git

diff --git a/scripts/debian/update-mirrorlists b/scripts/debian/update-mirrorlists
index b68a870c..a711d8a6 100755
--- a/scripts/debian/update-mirrorlists
+++ b/scripts/debian/update-mirrorlists
@@ -1,17 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Very Very hackish script...  dont laugh.
 # Michael Beattie <mjb@debian.org>
 
-. vars
+set -e
+
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
+. $SCRIPTVARS
 
 prog=$scriptdir/mirrorlist/mirror_list.pl
 masterlist=$scriptdir/mirrorlist/Mirrors.masterlist
 
-test ! -f $HOME/.cvspass && \
-	echo ":pserver:anonymous@cvs.debian.org:/cvs/webwml A" > $HOME/.cvspass
-grep -q "cvs.debian.org:/cvs/webwml" ~/.cvspass || \
-	echo ":pserver:anonymous@cvs.debian.org:/cvs/webwml A" >> $HOME/.cvspass
+test ! -f $HOME/.cvspass && touch $HOME/.cvspass
+
+grep -q "anonscm.debian.org:/cvs/webwml" ~/.cvspass || \
+	echo ":pserver:anonymous@anonscm.debian.org:/cvs/webwml A" >> $HOME/.cvspass
 
 cd $(dirname $masterlist)
 cvs update
@@ -20,10 +23,5 @@ if [ ! -f $ftpdir/README.mirrors.html -o $masterlist -nt $ftpdir/README.mirrors.
 	rm -f $ftpdir/README.mirrors.html $ftpdir/README.mirrors.txt
 	$prog -m $masterlist -t html > $ftpdir/README.mirrors.html
 	$prog -m $masterlist -t text > $ftpdir/README.mirrors.txt
-	if [ ! -f $ftpdir/README.non-US -o $masterlist -nt $ftpdir/README.non-US ] ; then
-		rm -f $ftpdir/README.non-US
-		$prog -m $masterlist -t nonus > $ftpdir/README.non-US
-		install -m 664 $ftpdir/README.non-US $webdir
-	fi
 	echo Updated archive version of mirrors file
 fi