From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 1 Nov 2009 21:31:09 +0000 (+0100)
Subject: dinstall
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=734d904438bdc597dc87e48a344e3291c7a67a32;p=dak.git

dinstall

and moved mkchecksums into dinstall

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 195b47fb..14471cc1 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -445,6 +445,19 @@ function mkfilesindices() {
     rm -f $ARCHLIST
     echo "Done!"
 }
+
+function mkchecksums() {
+    dsynclist=$dbdir/dsync.list
+    md5list=$indices/md5sums
+
+    log -n "Creating md5 / dsync index file ... "
+
+    cd "$ftpdir"
+    ${bindir}/dsync-flist -q generate $dsynclist --exclude $dsynclist --md5
+    ${bindir}/dsync-flist -q md5sums $dsynclist | gzip -9n --rsyncable > ${md5list}.gz
+    ${bindir}/dsync-flist -q link-dups $dsynclist || true
+}
+
 function scripts() {
     log "Running various scripts from $scriptsdir"
     cd $scriptsdir
@@ -452,7 +465,7 @@ function scripts() {
     copyoverrides
     mklslar
     mkfilesindices
-    ./mkchecksums
+    mkchecksums
 }
 
 function mirror() {
diff --git a/scripts/debian/mkchecksums b/scripts/debian/mkchecksums
deleted file mode 100755
index f733e89b..00000000
--- a/scripts/debian/mkchecksums
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Update the md5sums file
-
-set -e
-. $SCRIPTVARS
-
-dsynclist=$dbdir/dsync.list
-md5list=$indices/md5sums
-
-echo -n "Creating md5 / dsync index file ... "
-
-cd "$ftpdir"
-${bindir}/dsync-flist -q generate $dsynclist --exclude $dsynclist --md5
-${bindir}/dsync-flist -q md5sums $dsynclist | gzip -9n > ${md5list}.gz
-${bindir}/dsync-flist -q link-dups $dsynclist || true