From deebd533ce053601086c8d6a78f26461fcb3e300 Mon Sep 17 00:00:00 2001
From: Karl <karl@k-world.me.uk>
Date: Fri, 18 Jul 2025 10:10:48 +0100
Subject: [PATCH] fixing services

---
 kiosk_skeleton/boot/kioskbrowser.ini                     | 2 +-
 ...dule-screen.service => kiosk-schedule-screen.service} | 2 +-
 kiosk_skeleton/usr/bin/kiosk-autossh                     | 3 +--
 kiosk_skeleton/usr/bin/schedule-screen-timers            | 9 +--------
 kiosk_skeleton/usr/bin/setup-refresh-timer               | 4 +---
 5 files changed, 5 insertions(+), 15 deletions(-)
 rename kiosk_skeleton/etc/systemd/system/{kiosk-sechedule-screen.service => kiosk-schedule-screen.service} (76%)

diff --git a/kiosk_skeleton/boot/kioskbrowser.ini b/kiosk_skeleton/boot/kioskbrowser.ini
index d662cd6..ffb9d1d 100644
--- a/kiosk_skeleton/boot/kioskbrowser.ini
+++ b/kiosk_skeleton/boot/kioskbrowser.ini
@@ -15,7 +15,7 @@ reboot_time = 04:00
 ; set screen rotation to be used (normal, left, right, inverted)
 ;rotate_screen = "normal"
 ; configure screen to power on/off as specific time of day (time format in 24 hours)
-;screen_off_time=23:00
+screen_off_time=22:30
 ;screen_on_time=07:00
 ; configure chrome to refresh the page every x minutes
 ;refresh_screen_every_x_min=15
diff --git a/kiosk_skeleton/etc/systemd/system/kiosk-sechedule-screen.service b/kiosk_skeleton/etc/systemd/system/kiosk-schedule-screen.service
similarity index 76%
rename from kiosk_skeleton/etc/systemd/system/kiosk-sechedule-screen.service
rename to kiosk_skeleton/etc/systemd/system/kiosk-schedule-screen.service
index 7658d7c..e8eec52 100644
--- a/kiosk_skeleton/etc/systemd/system/kiosk-sechedule-screen.service
+++ b/kiosk_skeleton/etc/systemd/system/kiosk-schedule-screen.service
@@ -1,4 +1,4 @@
-# /etc/systemd/system/kiosk-sechedule-screen.service
+# /etc/systemd/system/kiosk-schedule-screen.service
 [Unit]
 Description=Schedule Screen On/Off Timers
 After=multi-user.target
diff --git a/kiosk_skeleton/usr/bin/kiosk-autossh b/kiosk_skeleton/usr/bin/kiosk-autossh
index 543c9b5..49c381b 100755
--- a/kiosk_skeleton/usr/bin/kiosk-autossh
+++ b/kiosk_skeleton/usr/bin/kiosk-autossh
@@ -6,8 +6,7 @@ then
 	if [ -f "/boot/id_rsa" ]; then
 		cp /boot/id_rsa /root/.ssh/id_rsa
 		AUTOSSH_KEYPATH="-i /root/.ssh/id_rsa"
-	fi
-	if [ -f "/boot/id_ed25519" ]; then
+	elif [ -f "/boot/id_ed25519" ]; then
 		cp /boot/id_ed25519 /root/.ssh/id_ed25519
 		AUTOSSH_KEYPATH="-i /root/.ssh/id_ed25519"
 	fi
diff --git a/kiosk_skeleton/usr/bin/schedule-screen-timers b/kiosk_skeleton/usr/bin/schedule-screen-timers
index f4b7c0a..6c5ae03 100755
--- a/kiosk_skeleton/usr/bin/schedule-screen-timers
+++ b/kiosk_skeleton/usr/bin/schedule-screen-timers
@@ -16,14 +16,7 @@ remount_root() {
 
 
 get_ini_value() {
-    local section=$1 key=$2
-    awk -F '=' -v sec="$section" -v k="$key" '
-    $0 ~ /^\[.*\]/ { in_section = ($0 == "[" sec "]") }
-    in_section && $1 ~ "^"k"$" {
-        gsub(/^[ \t]+|[ \t]+$/, "", $2)
-        print $2
-        exit
-    }' "$INI_FILE"
+    get-ini "$INI_FILE" "$1" "$2"
 }
 
 create_recurring_timer() {
diff --git a/kiosk_skeleton/usr/bin/setup-refresh-timer b/kiosk_skeleton/usr/bin/setup-refresh-timer
index 4510cc5..a775eea 100755
--- a/kiosk_skeleton/usr/bin/setup-refresh-timer
+++ b/kiosk_skeleton/usr/bin/setup-refresh-timer
@@ -1,9 +1,7 @@
 #!/bin/bash
 
 INI_FILE="/boot/kioskbrowser.ini"
-REFRESH_INTERVAL=$(awk -F '=' '/^\[screen\]/ { in_screen=1; next }
-                                in_screen && /^\[/ { in_screen=0 }
-                                in_screen && $1 ~ /refresh_screen_every_x_min/ { gsub(/ /, "", $2); print $2 }' "$INI_FILE")
+REFRESH_INTERVAL=$(get-ini "$INI_FILE" screen refresh_screen_every_x_min)
 
 # Function to safely remount root FS
 remount_root() {