X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=25553fa26461c96a823a8827754cdf07270c08f5;hb=773f4286615587294d6e6acfb850df53a661bbc5;hp=f4a1ef3e5460552c7514c9030d62bc9cac41a944;hpb=9914190d8f003e8bbf8a0504a954c25600516299;p=dak.git

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index f4a1ef3e..25553fa2 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -1,11 +1,5 @@
 # -*- mode:sh -*-
 
-# Remove daily lock
-# FIXME: Dead code when switched to cronscript
-function remove_daily_lock() {
-    rm -f $LOCK_DAILY
-}
-
 # Remove changelog lock
 function remove_changelog_lock() {
     rm -f $LOCK_CHANGELOG
@@ -56,14 +50,48 @@ function qa1() {
     ssh -n -2 -i ~dak/.ssh/push_merkel_qa  -o BatchMode=yes -o SetupTimeOut=90 -o ConnectTimeout=90 qa@qa.debian.org sleep 1
 }
 
+function mirrorlists() {
+    local mldir="${scriptdir}/mirrorlist"
+    local masterlist=${mldir}/Mirrors.masterlist
+
+    cd ${mldir}
+
+    [[ -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
+
+    cvs update
+
+    if [[ ! -f ${ftpdir}/README.mirrors.html ]] || [[ ${masterlist} -nt ${ftpdir}/README.mirrors.html ]]; then
+	rm -f ${ftpdir}/README.mirrors.{html,txt}
+	${mldir}/mirror_list.pl -m ${masterlist} -t html > ${ftpdir}/README.mirrors.html
+	${mldir}/mirror_list.pl -m ${masterlist} -t text > ${ftpdir}/README.mirrors.txt
+	log Updated archive version of mirrors file
+    fi
+}
+
+function mailingliststxt() {
+    cd ${ftpdir}/doc
+
+    log "Updating archive version of mailing-lists.txt"
+    wget ${wgetopts} https://www.debian.org/misc/mailing-lists.txt
+}
+
+function pseudopackages() {
+    cd ${scriptdir}/masterfiles
+
+    log "Updating archive version of pseudo-packages"
+    for file in maintainers description; do
+	wget ${wgetopts} https://bugs.debian.org/pseudopackages/pseudo-packages.${file}
+    done
+}
+
 # Updating various files
-function updates() {
-    log "Updating Bugs docu, Mirror list and mailing-lists.txt"
+function bugdoctxt() {
+    log "Updating Bugs docu"
     cd $configdir
     $scriptsdir/update-bugdoctxt
-    $scriptsdir/update-mirrorlists
-    $scriptsdir/update-mailingliststxt
-    $scriptsdir/update-pseudopackages.sh
 }
 
 # The first i18n one, syncing new descriptions
@@ -682,3 +710,9 @@ function startup() {
     touch "${LOCK_BRITNEY}"
     TMPFILES="${TMPFILES} ${LOCK_DAILY} ${LOCK_BRITNEY}"
 }
+
+function postcronscript() {
+    logstats ${LOGFILE}
+    state "all done"
+    touch "${DINSTALLEND}"
+}
\ No newline at end of file