From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 28 Aug 2014 14:55:56 +0000 (+0100)
Subject: Merge branch 'master' into distorted
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mirror-admin/commitdiff_plain/2f3bc14a0a9008a0ba50927f3ab2050258c7b65f?hp=-c

Merge branch 'master' into distorted

* master:
  bin/run-mirrors: Run post scripts after mirror jobs.
---

2f3bc14a0a9008a0ba50927f3ab2050258c7b65f
diff --combined bin/run-mirrors
index ed6fb46,cddea70..5335f32
--- a/bin/run-mirrors
+++ b/bin/run-mirrors
@@@ -9,8 -9,8 +9,8 @@@ case $(id -un) i
  esac
  
  ## Set up a plausible environment.
 -HOME=/var/lib/mirror-admin; export HOME; cd
 -MIRRORS=/mnt/mirrors; export MIRRORS
 +HOME=/var/lib/mirror; export HOME; cd
 +MIRRORS=/mnt/ftp/pub/mirrors; export MIRRORS
  PATH=$HOME/bin:/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin:/usr/local/sbin
  export PATH
  umask 002
@@@ -56,5 -56,15 +56,15 @@@ for file in $(run-parts --list etc/mirr
      set +e; (trap - INT; exec "$file"); rc=$?; set -e
      echo
      echo "*** Finished $(date +%Y-%m-%dT%H:%M:%S); rc = $rc"
+     if [ -d etc/post-$base.d ]; then
+       for i in $(run-parts --list etc/post-$base.d); do
+ 	s=${i##*/}
+ 	echo
+ 	echo "*** Running post-script $s at $(date +%Y-%m-%dT%H:%M:%S)"
+ 	set +e; (trap - INT; exec "$i"); rc=$?; set -e
+ 	echo
+ 	echo "*** Finished post-script $s $(date +%Y-%m-%dT%H:%M:%S); rc = $rc"
+       done
+     fi
    ) >>log/$base.log 2>&1
  done