Webstar/LibrePortal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge claude/1

Browse Source
This commit is contained in:
librelad 2026-06-12 23:11:14 +01:00
commit 105644364f
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/config/core/config_find_file.sh
View File

@ -5,8 +5,10 @@ findConfigFileForOption()
{ {
local config_option="$1" local config_option="$1"
# Global configs first. # Global configs first. Dotfiles (reconcile backups, markers) are excluded —
for config_file in $(find "$configs_dir" -type f -name "*" ! -name ".category"); do # finding a key in a .bak before its real file would write the user's
# config update into the backup and silently lose it.
for config_file in $(find "$configs_dir" -type f ! -name ".category" ! -name ".*" ! -name "*.bak"); do
if [ -f "$config_file" ] && grep -q "^$config_option=" "$config_file"; then if [ -f "$config_file" ] && grep -q "^$config_option=" "$config_file"; then
echo "$config_file" echo "$config_file"
return 0 return 0

11
scripts/config/core/variables/config_scan_variables.sh
View File

@ -8,8 +8,10 @@
# markers) from the template, so label / metadata / marker changes shipped # markers) from the template, so label / metadata / marker changes shipped
# in a release reach existing installs without nuking user values. # in a release reach existing installs without nuking user values.
# Structure, ordering and comments follow the template. Non-interactive, atomic, # Structure, ordering and comments follow the template. Non-interactive, atomic,
# and keeps a <file>.bak. Refuses to act on a missing/empty template so a broken # and keeps a hidden .<file>.bak sibling (dot-named so backups don't clutter the
# clone can never wipe a live config. # configs folder and can never be picked up by the config walkers/sourcing).
# Refuses to act on a missing/empty template so a broken clone can never wipe a
# live config.
# Split `CFG_KEY=value...#comment` into its value-part and comment-part. # Split `CFG_KEY=value...#comment` into its value-part and comment-part.
# Used by reconcileConfigFile to swap the template's comment onto the user's # Used by reconcileConfigFile to swap the template's comment onto the user's
@ -87,9 +89,10 @@ reconcileConfigFile()
# Replace only when the result is sane (non-empty, has keys) and differs. # Replace only when the result is sane (non-empty, has keys) and differs.
if [[ -s "$tmp" ]] && grep -q '^CFG_' "$tmp" && ! runInstallOp cmp -s "$tmp" "$live"; then if [[ -s "$tmp" ]] && grep -q '^CFG_' "$tmp" && ! runInstallOp cmp -s "$tmp" "$live"; then
runCfgOp cp -a "$live" "${live}.bak" local bak_file="${live%/*}/.${live##*/}.bak"
runCfgOp cp -a "$live" "$bak_file"
{ [[ -n "$containers_dir" && "$live" == "$containers_dir"* ]] && runFileWrite "$live" < "$tmp" || runInstallOp cp "$tmp" "$live"; } { [[ -n "$containers_dir" && "$live" == "$containers_dir"* ]] && runFileWrite "$live" < "$tmp" || runInstallOp cp "$tmp" "$live"; }
isSuccessful "Reconciled config: $(basename "$live") (backup: $(basename "$live").bak)" isSuccessful "Reconciled config: $(basename "$live") (backup: ${bak_file##*/})"
fi fi
rm -f "$tmp" rm -f "$tmp"
} }