From cea6ad998864a8e8c4c6e28638d03bc168ee3498 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sat, 19 Aug 2023 10:37:02 -0400 Subject: [PATCH] Update the configure-stormux stub to use the audible prompt. --- pi4/build/build-stormux.sh | 3 ++- pi4/files/usr/local/bin/configure-stormux | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pi4/build/build-stormux.sh b/pi4/build/build-stormux.sh index e4c72ef..f50e6a5 100755 --- a/pi4/build/build-stormux.sh +++ b/pi4/build/build-stormux.sh @@ -275,7 +275,8 @@ cp -rv ../files/boot/* /mnt/boot cp -rv ../files/etc/* /mnt/etc cp -rv ../files/var/* /mnt/var cp -rv ../files/usr/* /mnt/usr -cp -rv ../files/etc/skel/{.,}* /mnt/home/stormux/ +cp -rv ../files/etc/skel/.* /mnt/home/stormux/ +cp -rv ../files/etc/skel/* /mnt/home/stormux/ # Exiting calls the cleanup function to unmount. exit 0 diff --git a/pi4/files/usr/local/bin/configure-stormux b/pi4/files/usr/local/bin/configure-stormux index e5b3675..9bfad8a 100755 --- a/pi4/files/usr/local/bin/configure-stormux +++ b/pi4/files/usr/local/bin/configure-stormux @@ -1,14 +1,16 @@ #!/bin/bash trap 'popd &> /dev/null' EXIT + +export SUDO_ASKPASS=/etc/audibleprompt.sh if [[ ! -d /opt/configure-stormux ]]; then # Offer to switch fenrir layout. echo "Would you like to switch Fenrir to laptop layout? (y/n)" read -r continue continue="${continue::1}" if [[ "${continue,}" == "y" ]];then - sudo sed -i 's/=desktop/=laptop/' /etc/fenrirscreenreader/settings/settings.conf - sudo systemctl restart fenrirscreenreader.service + sudo -A sed -i 's/=desktop/=laptop/' /etc/fenrirscreenreader/settings/settings.conf + sudo -A systemctl restart fenrirscreenreader.service clear fi if ! ping -c1 stormux.org &> /dev/null ; then @@ -24,7 +26,7 @@ if [[ ! -d /opt/configure-stormux ]]; then nmtui-connect fi # Check for internet connectivity -if ping -qc1 -W 1 gnu.org &> /dev/null; then +if ping -qc1 -W 1 stormux.org &> /dev/null; then echo "Updating the clock to prevent certificate errors..." # Get current date and time date_time=$(curl -s http://worldtimeapi.org/api/ip | grep -oP '(?<="datetime":")[^"]*')