fix: address multiple bugs from code review
- teardown_all.sh: replace `yes |` pipeline with `< <(yes)` process
substitution to avoid SIGPIPE (exit 141) false failures under pipefail
- phase6_teardown.sh: extract push mirror `.id` instead of `.remote_name`
to match the DELETE /push_mirrors/{id} API contract
- phase5_migrate_pipelines.sh: expand sed regex from `[a-z_]*` to
`[a-z_.]*` to handle nested GitHub contexts like
`github.event.pull_request.number`
- lib/common.sh: render_template now requires explicit variable list to
prevent envsubst from eating Nginx variables ($host, $proxy_add_...)
- backup scripts: remove MacBook relay, use direct Unraid↔Fedora SCP;
fix dump path to write to /data/ (mounted volume) instead of /tmp/
(container-only); add unzip -t integrity verification
- preflight.sh: add --skip-port-checks flag for resuming with
--start-from (ports already bound by earlier phases)
- run_all.sh: update run_step to pass extra args; use --skip-port-checks
when --start-from > 1
- post-checks (phase4/7/9): wrap API calls in helper functions with
>/dev/null redirection instead of passing -o /dev/null as API data
- phase8: replace GitHub archiving with [MIRROR] description marking
and disable wiki/projects/Pages (archived repos reject push mirrors)
- restore_to_primary.sh: add require_vars for Fedora SSH variables
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -65,7 +65,7 @@ fi
|
||||
# ---------------------------------------------------------------------------
|
||||
# Step 1: Transfer archive to Unraid /tmp if needed
|
||||
# If the archive is a local file, SCP it directly. If it's on Fedora,
|
||||
# we relay through the local machine.
|
||||
# SCP directly from Fedora to Unraid (no MacBook relay).
|
||||
# ---------------------------------------------------------------------------
|
||||
log_step 1 "Preparing archive..."
|
||||
ARCHIVE_NAME=$(basename "$ARCHIVE_PATH")
|
||||
@@ -76,16 +76,13 @@ if [[ -f "$ARCHIVE_PATH" ]]; then
|
||||
log_info "Uploading local archive to Unraid..."
|
||||
scp_to UNRAID "$ARCHIVE_PATH" "$UNRAID_ARCHIVE"
|
||||
else
|
||||
# Assume path is on Fedora — relay through local machine
|
||||
# Assume path is on Fedora — SCP directly from Fedora to Unraid
|
||||
require_vars FEDORA_IP FEDORA_SSH_USER UNRAID_IP UNRAID_SSH_USER
|
||||
log_info "Transferring archive from Fedora to Unraid..."
|
||||
LOCAL_TMP=$(mktemp -d)
|
||||
# SCP from Fedora to local
|
||||
ip="${FEDORA_IP:-}" user="${FEDORA_SSH_USER:-}" port="${FEDORA_SSH_PORT:-22}"
|
||||
scp -o ConnectTimeout=10 -o BatchMode=yes -P "$port" \
|
||||
"${user}@${ip}:${ARCHIVE_PATH}" "${LOCAL_TMP}/${ARCHIVE_NAME}"
|
||||
# SCP from local to Unraid
|
||||
scp_to UNRAID "${LOCAL_TMP}/${ARCHIVE_NAME}" "$UNRAID_ARCHIVE"
|
||||
rm -rf "$LOCAL_TMP"
|
||||
UNRAID_PORT="${UNRAID_SSH_PORT:-22}"
|
||||
ssh_exec FEDORA "scp -o ConnectTimeout=10 -o StrictHostKeyChecking=accept-new \
|
||||
-o BatchMode=yes -P '${UNRAID_PORT}' \
|
||||
'${ARCHIVE_PATH}' '${UNRAID_SSH_USER}@${UNRAID_IP}:${UNRAID_ARCHIVE}'"
|
||||
fi
|
||||
log_success "Archive ready on Unraid: ${UNRAID_ARCHIVE}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user