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

Merge claude/2

Browse Source
This commit is contained in:
librelad 2026-05-24 22:39:43 +01:00
commit cf87cbeb0f
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/config/application/application_missing_variables.sh
View File

@ -9,7 +9,10 @@ checkApplicationsConfigFilesMissingVariables()
app=$(basename "$live" .config)
remote="$install_containers_dir$app/$app.config"
reconcileConfigFile "$live" "$remote"
done < <(runFileOp find "$containers_dir" -maxdepth 2 -type f -name '*.config' ! -name '*.bak')
# 2>/dev/null: before the docker-type config loads (early install) runFileOp
# falls back to the manager, which can't list the container-owned containers/
# dir — harmless "Permission denied" on a best-effort reconcile (no apps yet).
done < <(runFileOp find "$containers_dir" -maxdepth 2 -type f -name '*.config' ! -name '*.bak' 2>/dev/null)
isSuccessful "Application config reconciliation completed."
}

7
scripts/source/loading/scan_files.sh
View File

@ -61,7 +61,12 @@ sourceScanFiles()
source "$file"
# echo "$load_type FILE $file"
fi
done < <($scan_op find "$folder_dir" -maxdepth 3 -type d \( -name 'resources' \) -prune -o -type f -name "$file_pattern" -print0)
# 2>/dev/null: early in an install the docker-type config isn't loaded
# yet, so runFileOp falls back to the manager, which can't list the
# container-owned containers/ dir — a harmless "Permission denied" on a
# best-effort scan (no app configs exist yet). Suppress that noise; the
# -print0 output still flows.
done < <($scan_op find "$folder_dir" -maxdepth 3 -type d \( -name 'resources' \) -prune -o -type f -name "$file_pattern" -print0 2>/dev/null)
fi
# Load the categories from the file into an array