From c94a71e0d6ac5575ab502e43d47bdfa9d1b3f7b9 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Wed, 3 Jun 2026 00:34:19 -0400 Subject: [PATCH] Missed some deamon to daemon updates. This shoulf make Fenrir work with the installer automatically again, switching modes, etc. --- .gitignore | 1 + pi4/files/usr/local/bin/configure-stormux | 20 +++++++++++-------- .../scripts/ssh-login-monitor.sh | 2 +- .../airootfs/usr/local/bin/configure-stormux | 6 ++++-- .../scripts/ssh-login-monitor.sh | 2 +- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index e71376c..07b0825 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ CLAUDE.md *.sha1sum *.xz *.zst +scripts/xlibre-video-dummy-with-vt/ diff --git a/pi4/files/usr/local/bin/configure-stormux b/pi4/files/usr/local/bin/configure-stormux index cd2579f..841b1ce 100755 --- a/pi4/files/usr/local/bin/configure-stormux +++ b/pi4/files/usr/local/bin/configure-stormux @@ -7,19 +7,20 @@ if [[ -x /etc/audibleprompt.sh ]]; then export sudoFlags=("-A") fi -trap cleanup EXIT +# shellcheck disable=SC2329 cleanup() { - popd &> /dev/null + popd &> /dev/null || true if ! [[ -x /opt/configure-stormux/configure-stormux.sh ]]; then echo "Initial setup is not complete." echo "To continue setup, please run:" echo "sudo configure-stormux" fi } +trap cleanup EXIT if [[ -x /opt/configure-stormux/configure-stormux.sh ]]; then - pushd /opt/configure-stormux + pushd /opt/configure-stormux || exit 1 ./configure-stormux.sh exit 0 fi @@ -33,25 +34,27 @@ set_timezone() { mapfile -t regions < <(timedatectl --no-pager list-timezones | cut -d '/' -f1 | sort -u) # Use the same text twice here and just hide the tag field. + # shellcheck disable=SC2046 region=$(dialog --backtitle "Please select your Region" \ --no-tags \ --menu "Use up and down arrows or page-up and page-down to navigate the list, and press 'Enter' to make your selection." 0 0 0 \ - $(for i in ${regions[@]} ; do echo "$i";echo "$i";done) --stdout) + $(for i in "${regions[@]}" ; do echo "$i";echo "$i";done) --stdout) mapfile -t cities < <(timedatectl --no-pager list-timezones | grep "$region" | cut -d '/' -f2 | sort -u) # Use the same text twice here and just hide the tag field. + # shellcheck disable=SC2046 city=$(dialog --backtitle "Please select a city near you" \ --no-tags \ --menu "Use up and down arrow or page-up and page-down to navigate the list." 0 0 10 \ - $(for i in ${cities[@]} ; do echo "$i";echo "$i";done) --stdout) + $(for i in "${cities[@]}" ; do echo "$i";echo "$i";done) --stdout) # Set the timezone if [[ -f /etc/localtime ]]; then rm /etc/localtime fi - ln -sf /usr/share/zoneinfo/${region}/${city} /etc/localtime + ln -sf /usr/share/zoneinfo/"${region}"/"${city}" /etc/localtime timedatectl set-ntp true } # Offer to switch fenrir layout. @@ -81,6 +84,7 @@ if [[ $diskSize -le 7 ]]; then diskDevice="${BASH_REMATCH[1]}" else # Handle sda2, sdb3 style + # shellcheck disable=SC2001 diskDevice="$(echo "$diskSource" | sed 's/[0-9]*$//')" fi echo "Yes" | sudo "${sudoFlags[@]}" parted ---pretend-input-tty "$diskDevice" resizepart 2 100% @@ -91,9 +95,9 @@ fi if ! ping -c1 stormux.org &> /dev/null ; then echo "No internet connection detected. Press enter to open NetworkManager." read -r continue - echo "setting set focus#highlight=True" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock + echo "setting set focus#highlight=True" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-daemon.sock nmtui-connect - echo "setting set focus#highlight=False" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock + echo "setting set focus#highlight=False" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-daemon.sock fi # Check for internet connectivity if ping -qc1 -W 1 stormux.org &> /dev/null; then diff --git a/pi4/files/usr/share/fenrirscreenreader/scripts/ssh-login-monitor.sh b/pi4/files/usr/share/fenrirscreenreader/scripts/ssh-login-monitor.sh index 494d0e0..6d647c3 100755 --- a/pi4/files/usr/share/fenrirscreenreader/scripts/ssh-login-monitor.sh +++ b/pi4/files/usr/share/fenrirscreenreader/scripts/ssh-login-monitor.sh @@ -4,7 +4,7 @@ # Monitors SSH logins and announces them via Fenrir's speech system # Configuration -fenrirSocket="/tmp/fenrirscreenreader-deamon.sock" +fenrirSocket="/tmp/fenrirscreenreader-daemon.sock" logFile="/var/log/auth.log" stateFile="/tmp/fenrir-ssh-monitor.state" checkInterval=2 # seconds between checks diff --git a/x86_64/airootfs/usr/local/bin/configure-stormux b/x86_64/airootfs/usr/local/bin/configure-stormux index f7fbc7c..8c7646e 100755 --- a/x86_64/airootfs/usr/local/bin/configure-stormux +++ b/x86_64/airootfs/usr/local/bin/configure-stormux @@ -14,6 +14,7 @@ set_timezone() { mapfile -t regions < <(timedatectl --no-pager list-timezones | cut -d '/' -f1 | sort -u) # Use the same text twice here and just hide the tag field. + # shellcheck disable=SC2046 region=$(dialog --backtitle "Please select your Region" \ --no-tags \ --menu "Use up and down arrows or page-up and page-down to navigate the list, and press 'Enter' to make your selection." 0 0 0 \ @@ -23,6 +24,7 @@ set_timezone() { mapfile -t cities < <(timedatectl --no-pager list-timezones | grep "$region" | cut -d '/' -f2 | sort -u) # Use the same text twice here and just hide the tag field. + # shellcheck disable=SC2046 city=$(dialog --backtitle "Please select a city near you" \ --no-tags \ --menu "Use up and down arrow or page-up and page-down to navigate the list." 0 0 10 \ @@ -49,9 +51,9 @@ fi if ! ping -c1 stormux.org &> /dev/null ; then echo "No internet connection detected. Press enter to open NetworkManager." read -r continue - echo "setting set focus#highlight=True" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock + echo "setting set focus#highlight=True" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-daemon.sock nmtui-connect - echo "setting set focus#highlight=False" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock + echo "setting set focus#highlight=False" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-daemon.sock fi # Check for internet connectivity if ping -qc1 -W 1 stormux.org &> /dev/null; then diff --git a/x86_64/airootfs/usr/share/fenrirscreenreader/scripts/ssh-login-monitor.sh b/x86_64/airootfs/usr/share/fenrirscreenreader/scripts/ssh-login-monitor.sh index 494d0e0..6d647c3 100755 --- a/x86_64/airootfs/usr/share/fenrirscreenreader/scripts/ssh-login-monitor.sh +++ b/x86_64/airootfs/usr/share/fenrirscreenreader/scripts/ssh-login-monitor.sh @@ -4,7 +4,7 @@ # Monitors SSH logins and announces them via Fenrir's speech system # Configuration -fenrirSocket="/tmp/fenrirscreenreader-deamon.sock" +fenrirSocket="/tmp/fenrirscreenreader-daemon.sock" logFile="/var/log/auth.log" stateFile="/tmp/fenrir-ssh-monitor.state" checkInterval=2 # seconds between checks