From 3ef8c7a0544f372f0d3c63c8055517e0c64347ec Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Thu, 25 Jun 2026 09:10:38 -0400
Subject: fix: graceful remote skip, quieter backups, accurate snapshot counts

A scheduled backup to an unreachable remote now skips (exit 0) instead of erroring, so cron stops logging a failure when the NAS or laptop is offline. Authentication and host-key failures still error loudly, so a genuinely broken backup isn't masked as offline.

The actual backup drops rsync -v for --info=stats1, so the logfile gets a per-run summary instead of every transferred file path. The dryrun stays verbose.

list and status no longer count the latest/ working directory as a snapshot.

Snapshot directories are now read-only beyond the top level (find -type d). Only directories are touched, never the hard-linked files, so permissions don't ripple across snapshots.

Previously-unchecked rotation steps (orphan cleanup, the latest/ touch, the read-only chmod) now warn instead of failing silently. The remote snapshot listing falls back to BSD stat when GNU stat isn't available.
---
 tests/cases/test_backup.sh | 52 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'tests/cases/test_backup.sh')

diff --git a/tests/cases/test_backup.sh b/tests/cases/test_backup.sh
index af01221..607942e 100755
--- a/tests/cases/test_backup.sh
+++ b/tests/cases/test_backup.sh
@@ -245,6 +245,56 @@ EOF
     teardown_test_env
 }
 
+# ------------------------------------------------------------------------------
+# Test: nested directories in a snapshot are read-only (not just the top dir)
+# ------------------------------------------------------------------------------
+test_snapshot_nested_dirs_readonly() {
+    setup_test_env
+
+    create_test_config >/dev/null
+    create_test_includes >/dev/null
+    create_test_excludes >/dev/null
+
+    sudo INSTALLHOME="$TEST_CONFIG_DIR" RSYNCSHOT_SKIP_MOUNT_CHECK=1 "$SCRIPT_PATH" manual 1 >/dev/null 2>&1
+
+    # A nested directory inside the snapshot (stored under its full path by -R)
+    local nested="$TEST_BACKUP_DIR/$HOSTNAME/MANUAL.0$TEST_SOURCE_DIR/home"
+    local perms
+    perms=$(stat -c '%A' "$nested" 2>/dev/null)
+    if [[ "$perms" == *w* ]]; then
+        echo "FAIL: nested snapshot dir should be read-only (perms: $perms)"
+        teardown_test_env
+        return 1
+    fi
+
+    teardown_test_env
+    return 0
+}
+
+# ------------------------------------------------------------------------------
+# Test: status counts snapshots without counting the latest/ working dir
+# ------------------------------------------------------------------------------
+test_status_excludes_latest_from_count() {
+    setup_test_env
+
+    create_test_config >/dev/null
+    create_test_includes >/dev/null
+    create_test_excludes >/dev/null
+
+    # One backup creates MANUAL.0 plus the latest/ working dir
+    sudo INSTALLHOME="$TEST_CONFIG_DIR" RSYNCSHOT_SKIP_MOUNT_CHECK=1 "$SCRIPT_PATH" manual 1 >/dev/null 2>&1
+
+    local output
+    output=$(sudo INSTALLHOME="$TEST_CONFIG_DIR" RSYNCSHOT_SKIP_MOUNT_CHECK=1 "$SCRIPT_PATH" status 2>&1)
+
+    assert_contains "$output" "1 snapshot(s) found" "status should count 1 snapshot, not counting latest/" || {
+        teardown_test_env
+        return 1
+    }
+
+    teardown_test_env
+}
+
 # ------------------------------------------------------------------------------
 # Run tests
 # ------------------------------------------------------------------------------
@@ -261,6 +311,8 @@ run_backup_tests() {
     run_test "backup command works as alias" test_backup_command
     run_test "excludes files matching patterns" test_excludes_patterns
     run_test "same-basename sources don't collide" test_no_basename_collision
+    run_test "status count excludes latest/" test_status_excludes_latest_from_count
+    run_test "nested snapshot dirs are read-only" test_snapshot_nested_dirs_readonly
 }
 
 # Run if executed directly
-- 
cgit v1.2.3