X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=e9f8bfd3af6c0b784d140379f9567d71bae3817c;hp=d6870a7c4ef78b2a6459e3269c544b2c2b26feb0;hb=09a1a20566dcf84ca229b4339bd8f8080eb59afd;hpb=3bcca86748b452397499978565aa5a22bcf2242e

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index d6870a7c..e9f8bfd3 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -194,31 +194,14 @@ function mklslar() {
     FILENAME=ls-lR
 
     log "Removing any core files ..."
-    find -type f -name core -print0 | xargs -0r rm -v
-
-    log "Checking permissions on files in the FTP tree ..."
-    find -type f \( \! -perm -444 -o -perm +002 \) -ls
-    find -type d \( \! -perm -555 -o -perm +002 \) -ls
+    find -type f -name core -print -delete
 
     log "Checking symlinks ..."
     symlinks -rd .
 
     log "Creating recursive directory listing ... "
-    rm -f .${FILENAME}.new
-    TZ=UTC ls -lR > .${FILENAME}.new
-
-    if [ -r ${FILENAME}.gz ] ; then
-        mv -f ${FILENAME}.gz ${FILENAME}.old.gz
-        mv -f .${FILENAME}.new ${FILENAME}
-        rm -f ${FILENAME}.patch.gz
-        zcat ${FILENAME}.old.gz | diff -u - ${FILENAME} | gzip -9cfn - >${FILENAME}.patch.gz
-        rm -f ${FILENAME}.old.gz
-    else
-        mv -f .${FILENAME}.new ${FILENAME}
-    fi
-
-    gzip -9cfN ${FILENAME} >${FILENAME}.gz
-    rm -f ${FILENAME}
+    rm -f ${FILENAME}.gz
+    TZ=UTC ls -lR | gzip -9c --rsyncable > ${FILENAME}.gz
 }
 
 function mkmaintainers() {
@@ -241,6 +224,7 @@ function copyoverrides() {
 }
 
 function mkfilesindices() {
+    set +o pipefail
     umask 002
     cd $base/ftp/indices/files/components
 
@@ -373,6 +357,7 @@ function mkfilesindices() {
 
     rm -f $ARCHLIST
     log "Done!"
+    set -o pipefail
 }
 
 function mkchecksums() {