Code restructure on configure-stormux stub.

pi4/files/usr/local/bin/configure-stormux

@@ -15,17 +15,16 @@ if [[ -x /opt/configure-stormux/configure-stormux.sh ]]; then
     exit 0
 fi
 
-if [[ ! -d /opt/configure-stormux ]]; then
-    # Offer to switch fenrir layout.
-    echo "Would you like to switch Fenrir to laptop layout?"
-    echo "Press y for yes or n for no followed by enter."
-    read -r continue
-    continue="${continue::1}"
-    if [[ "${continue,}" == "y" ]];then
-        sed -i 's/=desktop/=laptop/' /etc/fenrirscreenreader/settings/settings.conf
-        clear
-        systemctl restart fenrirscreenreader.service
-    fi
+# Offer to switch fenrir layout.
+echo "Would you like to switch Fenrir to laptop layout?"
+echo "Press y for yes or n for no followed by enter."
+read -r continue
+continue="${continue::1}"
+if [[ "${continue,}" == "y" ]];then
+    sed -i 's/=desktop/=laptop/' /etc/fenrirscreenreader/settings/settings.conf
+    clear
+    systemctl restart fenrirscreenreader.service
+fi
 
 # Check for possible resize
 diskSource="$(df --output='source' / | tail -1)"
@@ -41,33 +40,32 @@ if [[ $diskSize -le 5 ]]; then
     fi
 fi
  
-    if ! ping -c1 stormux.org &> /dev/null ; then
-        echo "No internet connection detected. Press enter to open NetworkManager."
-        echo "Note, it is best to put Fenrir into highlight mode while using NetworkManager."
-        echo "In desktop layout this is done by pressing Fenrir+numpad asterisk."
-        echo "That is the key just above numpad 9."
-        echo "In laptop mode, press Fenrir+y."
-        echo "In desktop mode the Fenrir key is numpad insert."
-        echo "In laptop mode the Fenrir key is the Super key, sometimes called the Windows key."
-        echo "Press enter to continue."
-        read -r continue
-        nmtui-connect
-    fi
-    # Check for internet connectivity
-    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":")[^"]*')
-        echo "Current date and time: $date_time"
-        # set date and time
-        date -s "$date_time"
-    else
-        echo "Please connect to the internet and run ${0##*/} again."
-        exit 1
-    fi
-    echo "Installing configure-stormux..."
-    git -C /opt clone -q https://git.stormux.org/storm/configure-stormux || exit 1
+if ! ping -c1 stormux.org &> /dev/null ; then
+    echo "No internet connection detected. Press enter to open NetworkManager."
+    echo "Note, it is best to put Fenrir into highlight mode while using NetworkManager."
+    echo "In desktop layout this is done by pressing Fenrir+numpad asterisk."
+    echo "That is the key just above numpad 9."
+    echo "In laptop mode, press Fenrir+y."
+    echo "In desktop mode the Fenrir key is numpad insert."
+    echo "In laptop mode the Fenrir key is the Super key, sometimes called the Windows key."
+    echo "Press enter to continue."
+    read -r continue
+    nmtui-connect
 fi
+# Check for internet connectivity
+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":")[^"]*')
+    echo "Current date and time: $date_time"
+    # set date and time
+    date -s "$date_time"
+else
+    echo "Please connect to the internet and run ${0##*/} again."
+    exit 1
+fi
+echo "Installing configure-stormux..."
+git -C /opt clone -q https://git.stormux.org/storm/configure-stormux || exit 1
 
 echo
 echo "Initial setup is complete."
@@ -85,5 +83,4 @@ echo
 echo "Thank you for choosing Stormux."
 
 
-
 exit 0