Merge claude/2
This commit is contained in:
commit
8f6f4c65ed
10
init.sh
10
init.sh
@ -737,7 +737,12 @@ setupConfigsFromRepo()
|
|||||||
|
|
||||||
sudo mkdir -p "$dst"
|
sudo mkdir -p "$dst"
|
||||||
|
|
||||||
if ! sudo cp -a "$src"/. "$dst"/; then
|
# No-clobber: only seed config files that don't already exist. On a fresh
|
||||||
|
# install this copies the whole template; on a re-run/deploy it preserves the
|
||||||
|
# user's live values (a plain cp -a here silently reset e.g. the Docker
|
||||||
|
# install type back to the template default). New *keys* in existing files
|
||||||
|
# are added separately by the add-only reconcile pass.
|
||||||
|
if ! sudo cp -an "$src"/. "$dst"/; then
|
||||||
isError "Failed to copy configs from $src to $dst — aborting."
|
isError "Failed to copy configs from $src to $dst — aborting."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@ -1047,7 +1052,8 @@ sync_configs_from_install() {
|
|||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
sudo mkdir -p "$dst"
|
sudo mkdir -p "$dst"
|
||||||
if ! sudo cp -a "$src"/. "$dst"/; then
|
# No-clobber: preserve the user's live config values; only add new files.
|
||||||
|
if ! sudo cp -an "$src"/. "$dst"/; then
|
||||||
echo "ERROR: Failed to sync configs from $src to $dst."
|
echo "ERROR: Failed to sync configs from $src to $dst."
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user