diff --git a/scripts/darktable_sync.sh b/scripts/darktable_sync.sh index 4e2ddfd..df8459e 100755 --- a/scripts/darktable_sync.sh +++ b/scripts/darktable_sync.sh @@ -272,12 +272,15 @@ TOTAL_SENT=$((SENT_DB + SENT_PHOTOS)) TOTAL_RECEIVED=$((RECEIVED_DB + RECEIVED_PHOTOS)) if [ "$DRY_RUN" = true ]; then - UP_NEW=$( cat "$UPLOAD_LOG_DB" "$UPLOAD_LOG_PHOTOS" 2>/dev/null | grep -cE '^>f[+]{9}' || echo 0) - UP_UPD=$( cat "$UPLOAD_LOG_DB" "$UPLOAD_LOG_PHOTOS" 2>/dev/null | grep -E '^>f' | grep -cvE '^>f[+]{9}' || echo 0) - UP_DEL=$( cat "$UPLOAD_LOG_DB" "$UPLOAD_LOG_PHOTOS" 2>/dev/null | grep -cE '^\*deleting' || echo 0) - DN_NEW=$( cat "$DOWNLOAD_LOG_DB" "$DOWNLOAD_LOG_PHOTOS" 2>/dev/null | grep -cE '^/dev/null | grep -E '^/dev/null | grep -cE '^\*deleting' || echo 0) + upload_log=$(cat "$UPLOAD_LOG_DB" "$UPLOAD_LOG_PHOTOS" 2>/dev/null || true) + download_log=$(cat "$DOWNLOAD_LOG_DB" "$DOWNLOAD_LOG_PHOTOS" 2>/dev/null || true) + + UP_NEW=$( echo "$upload_log" | grep -cE '^>f[+]{9}' || echo 0) + UP_UPD=$( echo "$upload_log" | grep -E '^>f' | grep -cvE '^>f[+]{9}' || echo 0) + UP_DEL=$( echo "$upload_log" | grep -cE '^\*deleting' || echo 0) + DN_NEW=$( echo "$download_log" | grep -cE '^