Claude
037a62e008
Until now ./install.sh only managed an already-installed kiosk; ubuntu-based-kiosk.sh was still the only path from a bare Ubuntu Server box to a running one. install.sh now provisions from scratch too: packages, kiosk user, Node.js/Electron, LightDM+Openbox autologin, audio/video/HDMI/power-button hardware setup, and the firewall, then hands off to the already-migrated Core Settings/Advanced menus for initial configuration instead of reimplementing that logic again. - lib/provision.sh: the new provisioning flow, built mostly by calling existing menus (core_settings_menu, emergency hotspot, virtual consoles) - cuts it to ~300 lines against the legacy script's ~4,000-line first_time_install(). - lib/electron.sh: electron_install_binary() extracted out of menus/advanced_electron.sh so provisioning and the existing "Fix blank screen" action share one implementation. - kiosk-app/ and provision/files/: the Electron app source and every system template file, extracted byte-for-byte out of ubuntu-based-kiosk.sh's heredocs into real files. - Found and fixed a bash set -e gotcha along the way: testing a multi-statement function as an if-condition (`if ! some_func; then`) silently exempts everything inside that function from set -e for the duration of the call. Fixed in the new provisioning code and in menus/advanced_electron.sh's pre-existing repair action, which had the same shape. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VfsFSoRqfbRG7XAg5RoE7e
49 lines
2.1 KiB
Bash
Executable File
49 lines
2.1 KiB
Bash
Executable File
#!/bin/bash
|
|
# Assumes it's run with DISPLAY/XAUTHORITY already set for the kiosk user's
|
|
# X session (either inherited, as from Openbox autostart, or exported by the
|
|
# caller). Mirrors every connected non-primary output at the primary's exact
|
|
# current resolution so kiosk content isn't cropped/letterboxed/blank on a
|
|
# TV/monitor with a different native resolution than the kiosk panel.
|
|
|
|
QUERY=$(xrandr --query 2>/dev/null)
|
|
[ -z "$QUERY" ] && exit 0
|
|
|
|
PRIMARY_OUTPUT=$(echo "$QUERY" | awk '/ primary/{print $1; exit}')
|
|
[ -z "$PRIMARY_OUTPUT" ] && exit 0
|
|
|
|
PRIMARY_RES=$(echo "$QUERY" | awk -v p="$PRIMARY_OUTPUT" '$1==p{for(i=1;i<=NF;i++) if ($i ~ /^[0-9]+x[0-9]+\+/){split($i,a,"+"); print a[1]; exit}}')
|
|
[ -z "$PRIMARY_RES" ] && exit 0
|
|
|
|
for OUT in $(echo "$QUERY" | awk '/ connected/{print $1}'); do
|
|
[ "$OUT" = "$PRIMARY_OUTPUT" ] && continue
|
|
|
|
HAS_NATIVE=$(echo "$QUERY" | awk -v out="$OUT" -v res="$PRIMARY_RES" '
|
|
$0 ~ "^"out" " {infound=1; next}
|
|
/^[^ \t]/ {infound=0}
|
|
infound && $1==res {print "yes"; exit}
|
|
')
|
|
|
|
if [ "$HAS_NATIVE" = "yes" ]; then
|
|
xrandr --output "$OUT" --mode "$PRIMARY_RES" --same-as "$PRIMARY_OUTPUT" 2>/dev/null \
|
|
&& logger "KIOSK: mirrored $OUT at native $PRIMARY_RES" \
|
|
|| logger "KIOSK: mirror of $OUT at $PRIMARY_RES failed"
|
|
continue
|
|
fi
|
|
|
|
# $OUT doesn't natively list the primary's resolution - force a matching mode
|
|
CVT_LINE=$(cvt "${PRIMARY_RES%x*}" "${PRIMARY_RES#*x}" 2>/dev/null | grep Modeline)
|
|
MODENAME=$(echo "$CVT_LINE" | sed -n 's/^Modeline "\([^"]*\)".*/\1/p')
|
|
TIMINGS=$(echo "$CVT_LINE" | sed -n 's/^Modeline "[^"]*" *//p')
|
|
|
|
if [ -z "$MODENAME" ] || [ -z "$TIMINGS" ]; then
|
|
logger "KIOSK: could not generate a $PRIMARY_RES mode for $OUT (cvt failed or missing)"
|
|
continue
|
|
fi
|
|
|
|
xrandr --newmode "$MODENAME" $TIMINGS 2>/dev/null
|
|
xrandr --addmode "$OUT" "$MODENAME" 2>/dev/null
|
|
xrandr --output "$OUT" --mode "$MODENAME" --same-as "$PRIMARY_OUTPUT" 2>/dev/null \
|
|
&& logger "KIOSK: mirrored $OUT at forced $PRIMARY_RES ($MODENAME)" \
|
|
|| logger "KIOSK: mirror of $OUT at forced $PRIMARY_RES failed"
|
|
done
|