From f8654ee2a3e02390f8d02fcff0c0b924608e2096 Mon Sep 17 00:00:00 2001 From: onefang Date: Wed, 3 Dec 2025 05:34:22 +0100 Subject: Better names. --- devuan_package_mirror_sync.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/devuan_package_mirror_sync.sh b/devuan_package_mirror_sync.sh index 44cdfd7..7758313 100755 --- a/devuan_package_mirror_sync.sh +++ b/devuan_package_mirror_sync.sh @@ -94,20 +94,20 @@ mkdir -p ${MIRROR_PATH} # The rsync calls. # The --exclude "/devuan-cd/" is so we don't wipe out the ISO mirror. -start_time=$(date +%s%3N) -rsltM=$( ${BEHAVE} rsync ${OPTIONS} vesta@pkgmaster.devuan.org:~/devuan/ ${MIRROR_PATH} --exclude "/devuan-cd/" \ +startTime=$(date +%s%3N) +resultM=$( ${BEHAVE} rsync ${OPTIONS} vesta@pkgmaster.devuan.org:~/devuan/ ${MIRROR_PATH} --exclude "/devuan-cd/" \ --exclude "Packages*" --exclude "Sources*" --exclude "Release*" --exclude "InRelease" --exclude "Contents-*" --exclude "Translation-*" --exclude "ls-lR*" --exclude "current" --exclude ".~tmp~" ) -end_time=$(date +%s%3N) ; durationM=$((end_time - start_time)) +endTime=$(date +%s%3N) ; durationM=$((endTime - startTime)) -start_time=$(date +%s%3N) -rsltC=$( ${BEHAVE} rsync ${OPTIONS} -l --delete-delay vesta@pkgmaster.devuan.org:~/devuan/ ${MIRROR_PATH} --exclude "/devuan-cd/" ) -end_time=$(date +%s%3N) ; durationC=$((end_time - start_time)) +startTime=$(date +%s%3N) +resultC=$( ${BEHAVE} rsync ${OPTIONS} -l --delete-delay vesta@pkgmaster.devuan.org:~/devuan/ ${MIRROR_PATH} --exclude "/devuan-cd/" ) +endTime=$(date +%s%3N) ; durationC=$((endTime - startTime)) # Report the results. -rsltM=$( echo "$rsltM" | grep -Ev '/$|\.svg|\.txt$|\.txt.old$|versionlog\.state|log/sources|aintainers$|/by-hash/|skipping non-regular file' | head -n -4 | tail -n +2 ) -rsltC=$( echo "$rsltC" | grep -Ev '/$|\.svg|\.txt$|\.txt.old$|versionlog\.state|log/sources|aintainers$|/by-hash/' | head -n -3 | tail -n +2 ) -if [ -n "$rsltM" ] ; then echo -e "$rsltM\n"; fi -if [ $durationM -gt 4000 ] || [ -n "$rsltM" ] ; then echo -e "Main rsync time: $durationM ms.\n"; fi -if [ -n "$rsltC" ] ; then echo -e "$rsltC\n"; fi -if [ $durationC -gt 3000 ] || [ -n "$rsltC" ] ; then echo -e "Clean up rsync time: $durationC ms.\n"; fi +resultM=$( echo "$resultM" | grep -Ev '/$|\.svg|\.txt$|\.txt.old$|versionlog\.state|log/sources|aintainers$|/by-hash/|skipping non-regular file' | head -n -4 | tail -n +2 ) +resultC=$( echo "$resultC" | grep -Ev '/$|\.svg|\.txt$|\.txt.old$|versionlog\.state|log/sources|aintainers$|/by-hash/' | head -n -3 | tail -n +2 ) +if [ -n "$resultM" ] ; then echo -e "$resultM\n"; fi +if [ $durationM -gt 4000 ] || [ -n "$resultM" ] ; then echo -e "Main rsync time: $durationM ms.\n"; fi +if [ -n "$resultC" ] ; then echo -e "$resultC\n"; fi +if [ $durationC -gt 3000 ] || [ -n "$resultC" ] ; then echo -e "Clean up rsync time: $durationC ms.\n"; fi -- cgit v1.1