Final polish: explicit LOCK_FD close, tar --list SIGPIPE comment, marker timing comment, _extract_bash_function docstring

This commit is contained in:
copilot-swe-agent[bot]
2026-07-18 18:11:19 +00:00
committed by GitHub
parent de25110493
commit d1251bf238
2 changed files with 19 additions and 2 deletions
@@ -68,6 +68,9 @@ cleanup() {
done done
fi fi
# Release the concurrency lock file descriptor if it was opened
[[ -n "${LOCK_FD:-}" ]] && exec {LOCK_FD}>&- 2>/dev/null || true
if [[ "$LND_STOPPED" -eq 1 ]]; then if [[ "$LND_STOPPED" -eq 1 ]]; then
log "Restarting previously active LND-related services…" log "Restarting previously active LND-related services…"
for (( idx=${#LND_UNITS_TO_RESTART[@]}-1 ; idx>=0 ; idx-- )); do for (( idx=${#LND_UNITS_TO_RESTART[@]}-1 ; idx>=0 ; idx-- )); do
@@ -500,6 +503,9 @@ _create_archive_impl() {
fail "Archive $archive_name is empty after creation." fail "Archive $archive_name is empty after creation."
fi fi
# Fast readability check: read only the first tar entry header (~512 bytes).
# head -1 closes the pipe after one line, sending SIGPIPE to tar which then
# exits early — so this is O(1) regardless of archive size.
local spot_entry local spot_entry
spot_entry="$(LC_ALL=C tar --list --file "$partial_path" 2>/dev/null | head -1 || true)" spot_entry="$(LC_ALL=C tar --list --file "$partial_path" 2>/dev/null | head -1 || true)"
if [[ -z "$spot_entry" ]]; then if [[ -z "$spot_entry" ]]; then
@@ -860,6 +866,10 @@ CHECKSUM_FILE="$BACKUP_DIR/SHA256SUMS.txt"
echo "(/run/media/Second_Drive) and are reconstructable/internal-backup data." echo "(/run/media/Second_Drive) and are reconstructable/internal-backup data."
echo "" echo ""
echo "Artifact listing:" echo "Artifact listing:"
# INCOMPLETE exists at this point (created at backup start); BACKUP_COMPLETE does not
# exist yet (written after checksums). Excluding both marker files here is intentional:
# INCOMPLETE is excluded so it doesn't appear as a data artifact, and BACKUP_COMPLETE
# is excluded defensively for consistency should the ordering ever change.
find "$BACKUP_DIR" -mindepth 1 -maxdepth 2 -type f \ find "$BACKUP_DIR" -mindepth 1 -maxdepth 2 -type f \
! -name 'INCOMPLETE' ! -name 'BACKUP_COMPLETE' -print0 | sort -z | tr '\0' '\n' ! -name 'INCOMPLETE' ! -name 'BACKUP_COMPLETE' -print0 | sort -z | tr '\0' '\n'
} > "$MANIFEST_FILE" } > "$MANIFEST_FILE"
+9 -2
View File
@@ -17,8 +17,15 @@ NIX_HUB_FILE = REPO_ROOT / "modules" / "core" / "sovran-hub.nix"
def _extract_bash_function(script_path: Path, func_name: str) -> str: def _extract_bash_function(script_path: Path, func_name: str) -> str:
"""Extract a bash function definition from a shell script using Python regex. """Extract a bash function definition from a shell script using Python regex.
Returns the complete function definition as a string that can be inlined into
test scripts, avoiding eval of awk output and the associated risks.""" The pattern matches from 'funcname() {' to the first line whose only content
is '}' (the function closing brace, at column 0). This works correctly for
functions whose control structures (case/if/while/for) use indented braces,
because only the function's own closing brace sits at column 0. It would not
correctly extract a function that contains a nested function definition.
Returns the complete function definition, safe to inline into a test bash
script without eval or awk."""
source = script_path.read_text() source = script_path.read_text()
pattern = r"^" + re.escape(func_name) + r"\(\) \{.*?^}" pattern = r"^" + re.escape(func_name) + r"\(\) \{.*?^}"
match = re.search(pattern, source, re.MULTILINE | re.DOTALL) match = re.search(pattern, source, re.MULTILINE | re.DOTALL)