summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2016-01-07 10:27:20 +0100
committerPeter Palfrader <peter@palfrader.org>2016-01-07 10:27:20 +0100
commit516eea88c7a73e1a189fd7d59fff453a96ce86ce (patch)
treeefc616a637d7afb8d1c29aec0a82d530904179f9
parent3737d7cc414c6d6b4fe61a67d2ed3d6fab5abb2a (diff)
Only do _hierarchy and _traces when EXTENDEDTRACE is full, or when upstream does it
-rwxr-xr-xbin/ftpsync24
1 files changed, 14 insertions, 10 deletions
diff --git a/bin/ftpsync b/bin/ftpsync
index c34d362..f43ec3d 100755
--- a/bin/ftpsync
+++ b/bin/ftpsync
@@ -229,16 +229,20 @@ tracefile() {
} > "${TRACEFILE}.new"
mv "${TRACEFILE}.new" "${TRACEFILE}"
- {
- if [[ -e "${TO}/${TRACEHIERARCHY}.mirror" ]]; then
- cat "${TO}/${TRACEHIERARCHY}.mirror"
- fi
- echo "$(basename "${TRACEFILE}") ${MIRRORNAME} ${TRACEHOST} ${RSYNC_HOST}"
- } > "${TO}/${TRACEHIERARCHY}".new
- mv "${TO}/${TRACEHIERARCHY}".new "${TO}/${TRACEHIERARCHY}"
- cp "${TO}/${TRACEHIERARCHY}" "${TO}/${TRACEHIERARCHY}.mirror"
-
- (cd ${tracedir} && ls -1rt) | grep -E -v '^_|^master$' > "${TO}/${TRACELIST}"
+ if [[ full = ${EXTENDEDTRACE} ]] || [[ -e ${TO}/${TRACEHIERARCHY}.mirror ]]; then
+ {
+ if [[ -e ${TO}/${TRACEHIERARCHY}.mirror ]]; then
+ cat ${TO}/${TRACEHIERARCHY}.mirror
+ fi
+ echo "$(basename "${TRACEFILE}") ${MIRRORNAME} ${TRACEHOST} ${RSYNC_HOST}"
+ } > "${TO}/${TRACEHIERARCHY}".new
+ mv "${TO}/${TRACEHIERARCHY}".new "${TO}/${TRACEHIERARCHY}"
+ cp "${TO}/${TRACEHIERARCHY}" "${TO}/${TRACEHIERARCHY}.mirror"
+
+ (cd ${tracedir} && ls -1rt) | grep -E -v '^_|^master$' > "${TO}/${TRACELIST}"
+ else
+ rm -f "${TO}/${TRACEHIERARCHY}" "${TO}/${TRACELIST}"
+ fi
fi
;;
*)