From 0e1cf4fe5947c54bd7926cd1a0c6592638508a60 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 8 Nov 2024 13:50:26 +0100
Subject: [kiosk-chromium] Use is_on for bools

---
 .../data/opt/openslx/scripts/kiosk-launch.d/00-chromium        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium b/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium
index e8c60fb4..d952563e 100644
--- a/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium
+++ b/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium
@@ -35,6 +35,8 @@ json_bookmarks() {
 	done
 }
 
+. /opt/openslx/bin/slx-tools
+
 # Pass SLX_BROWSER_BOOKMARKS without quotes for splitting into arguments
 cat > "$HOME/.config/chromium/Default/Bookmarks" <<EOF
 {
@@ -71,8 +73,8 @@ chromium_args+=("--simulate-outdated-no-au=\"Tue, 31 Dec 2099 23:59:59 GMT\"")
 # default to maximized on startup
 chromium_args+=("--start-maximized")
 
-if [ -z "$SLX_BROWSER_INTERACTIVE" ]; then
-	if [ -n "${SLX_AUTOLOGIN%OFF}" ]; then
+if is_on "$SLX_BROWSER_INTERACTIVE"; then
+	if is_on "${SLX_AUTOLOGIN%OFF}"; then
 		# Autologin active, go full fullscreen
 		chromium_args+=("--kiosk")
 	fi
@@ -144,8 +146,8 @@ if [ -n "$SLX_BROWSER_RELOAD_SECS" ] && [ "$SLX_BROWSER_RELOAD_SECS" -gt 0 ]; th
 	) &
 fi
 
-if [ -n "$SLX_BROWSER_INSECURE" ]; then
-	chromium_args+=("--allow-running-insecure-content" "--ignore-certificate-errors")
+if is_on "$SLX_BROWSER_INSECURE"; then
+	chromium_args+=( "--allow-running-insecure-content" "--ignore-certificate-errors" )
 fi
 
 # Wait until cert store is fully populated
-- 
cgit v1.2.3-55-g7522