Skip to content

Preserve symlinks and verify zip backups #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vosslab wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Preserve symlinks and verify zip backups #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions codex-accounts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,20 @@ backup_current_to() {
local dest; dest="$(zip_path_for "$name")"

note "Saving current ~/.codex to ${dest}..."
cp -R "$CODEX_HOME" "${tmpdir}/.codex"
# -RP: preserve symlinks without following them
cp -RP "$CODEX_HOME" "${tmpdir}/.codex"
# Remove tmp/ before zipping (temporary patch files, not worth saving)
rm -rf "${tmpdir}/.codex/tmp"
# Remove old archive (zip -r updates existing archives instead of replacing)
rm -f "$dest"
(
cd "$tmpdir"
zip -r -q "$dest" .codex
# -y: store symlinks as symlinks (not their targets)
zip -y -r -q "$dest" .codex
)
rm -rf "$tmpdir"
ok "Saved."
local size; size="$(du -h "$dest" | cut -f1)"
ok "Saved ${size}."
}

extract_to_codex() {
Expand All @@ -83,11 +90,17 @@ extract_to_codex() {

[[ -f "$zipfile" ]] || die "Account archive not found: $zipfile"

# Extract into a guaranteed-empty subdir to avoid conflicts with existing entries
local tmpdir; tmpdir="$(mktemp -d)"
local extractdir="${tmpdir}/extract"
mkdir -p "$extractdir"

note "Extracting $(basename "$zipfile")..."
unzip -q "$zipfile" -d "$tmpdir"
# -o: overwrite without prompting (safe since extractdir is empty)
# This handles edge cases where zip has symlink + directory entries for same path
unzip -o -q "$zipfile" -d "$extractdir"

local extracted; extracted="$(find "$tmpdir" -type d -name ".codex" | head -n1)"
local extracted; extracted="$(find "$extractdir" -type d -name ".codex" | head -n1)"
[[ -z "${extracted:-}" ]] && { rm -rf "$tmpdir"; die ".codex folder missing inside archive."; }

rm -rf "$CODEX_HOME"
Expand Down