Compare commits

..

No commits in common. "d4426903240c69667a0079ecca3409b1488fab15" and "52454ab4615492c65aa50276b92af413ec531067" have entirely different histories.

2 changed files with 6 additions and 17 deletions

View File

@ -115,16 +115,7 @@ installLibrePortal()
echo "---- $menu_number. Generating all WebUI data files." echo "---- $menu_number. Generating all WebUI data files."
echo "" echo ""
# On a fresh (bootstrap) install startScan runs right after this and webuiLibrePortalUpdate;
# regenerates every data file — crucially AFTER scanConfigsForRandomPassword
# finalises app passwords, so that later pass is the authoritative one.
# Generating here as well would just be a premature duplicate, so defer to
# it. Standalone reinstalls (no bootstrap flag) still generate here.
if [[ "$libreportal_bootstrap_install" == "true" ]]; then
isNotice "Bootstrap install — deferring WebUI data generation."
else
webuiLibrePortalUpdate;
fi
if [[ "$libreportal_bootstrap_install" != "true" ]]; then if [[ "$libreportal_bootstrap_install" != "true" ]]; then
((menu_number++)) ((menu_number++))

View File

@ -4,13 +4,11 @@
# Coordinates all webui data updates including system info and app configurations # Coordinates all webui data updates including system info and app configurations
webuiLibrePortalUpdate() { webuiLibrePortalUpdate() {
# Debounce safety net: if this function gets called twice in quick # Debounce: during a fresh install this function gets called back-to-back
# succession (e.g. two app installs in a row), skip the second run when the # by installLibrePortal (line 113) and then startScan (end of preinstall),
# last successful one is within the debounce window. The fresh-install # both within ~10 seconds. Skip if the last successful run is within the
# duplicate — installLibrePortal followed by startScan — is handled # debounce window. Callers that genuinely need a forced refresh can set
# deterministically upstream (installLibrePortal defers to startScan during a # WEBUI_UPDATER_FORCE=1.
# bootstrap install), so this timer is only a backstop. Callers that
# genuinely need a forced refresh can set WEBUI_UPDATER_FORCE=1.
local stamp_file="/tmp/libreportal_webui_updater_last" local stamp_file="/tmp/libreportal_webui_updater_last"
local debounce_seconds="${WEBUI_UPDATER_DEBOUNCE:-30}" local debounce_seconds="${WEBUI_UPDATER_DEBOUNCE:-30}"
if [[ -z "$WEBUI_UPDATER_FORCE" && -f "$stamp_file" ]]; then if [[ -z "$WEBUI_UPDATER_FORCE" && -f "$stamp_file" ]]; then