Migrate Display & Interaction menu; drop version number from installer filename; bump to v2.0.0
- menus/display.sh: second menu migrated onto lib/menu.sh + lib/config.sh, covering touch gesture mode, link navigation security, and the pause/keyboard/navigation button toggles (previously three separate Core Settings entries). Deliberately a different shape from Sites (toggle list vs. list CRUD) to exercise the framework more broadly. Wired into install.sh's top-level menu alongside Sites. - Renamed ubuntu-based-kiosk-v1.0.3.sh -> ubuntu-based-kiosk.sh so the installer can be updated in place instead of growing a new version-numbered filename every release; released versions are now tracked via git history and the in-script changelog. Updated all Readme download/re-run commands accordingly. Older versioned files (ubuntu-based-kiosk-v*.sh, install_kiosk_*.sh) are left in place as archived releases. - Bumped SCRIPT_VERSION to 2.0.0 (new script-level changelog entry) and the Readme version/changelog to match, given the new modular management path, the rename, and the two real bugs fixed along the way (settings clobbered on save, off-by-one in reorder). Verified before moving on to the web admin work: - Regression: re-ran the full Sites scratch-config test suite (add, edit, delete, reorder, home) - still clean, no invalid-input paths hit. - New: scratch-config test for every display.sh action (touch mode, navigation security, all three toggles), confirming values persist through save/reload and that a previously-added site survives untouched across Display-menu saves. - End-to-end: ran the real install.sh (not just sourced functions) as a genuine non-root, non-"kiosk" user with real sudo, driving actual menu input through Sites -> add a page -> Display -> toggle a setting -> exit. Confirmed final config.json on disk matches every action taken, and both guard clauses (run as root; no installed kiosk found) fire correctly.
This commit is contained in:
+6
-4
@@ -10,8 +10,8 @@
|
||||
# lib/ and menus/, so a change to (say) the Sites menu can't accidentally
|
||||
# break WiFi setup or the uninstaller three thousand lines away.
|
||||
#
|
||||
# Today this only wires up the Sites & Page Timing menu (menus/sites.sh)
|
||||
# as a working proof of concept. The rest of Core Settings/Addons/Advanced
|
||||
# Today this wires up Sites & Page Timing (menus/sites.sh) and Display &
|
||||
# Interaction (menus/display.sh). The rest of Core Settings/Addons/Advanced
|
||||
# will move over the same way, one menus/*.sh file at a time.
|
||||
#
|
||||
# Usage (once the kiosk has already been installed):
|
||||
@@ -30,6 +30,8 @@ source "$SCRIPT_DIR/lib/menu.sh"
|
||||
source "$SCRIPT_DIR/lib/config.sh"
|
||||
# shellcheck source=menus/sites.sh
|
||||
source "$SCRIPT_DIR/menus/sites.sh"
|
||||
# shellcheck source=menus/display.sh
|
||||
source "$SCRIPT_DIR/menus/display.sh"
|
||||
|
||||
################################################################################
|
||||
# Preflight
|
||||
@@ -66,8 +68,8 @@ fi
|
||||
################################################################################
|
||||
|
||||
main_menu_builder() {
|
||||
MENU_LABELS=("Sites & Page Timing")
|
||||
MENU_HANDLERS=(sites_menu)
|
||||
MENU_LABELS=("Sites & Page Timing" "Display & Interaction")
|
||||
MENU_HANDLERS=(sites_menu display_menu)
|
||||
}
|
||||
|
||||
main_menu_status() {
|
||||
|
||||
Reference in New Issue
Block a user