1 files changed, 7 insertions, 7 deletions
diff --git a/linhes/linhes-system/lh_system_start.sh b/linhes/linhes-system/lh_system_start.sh
index 3cbf5dc..d1bd2b9 100755
--- a/linhes/linhes-system/lh_system_start.sh
+++ b/linhes/linhes-system/lh_system_start.sh
@@ -55,15 +55,15 @@ function install_lh_apps(){
     #check network connection
     netwait=0
     while ! timeout 1 nc -zw1 1.1.1.1 443; do
-        [ $netwait -gt 12 ] && msg "Could not install apps. Check internet connection. Cancelling Setup." && exit 1
-        msg "Waiting for internet connectivity..."
+       1 [ $netwait -gt 60 ] && msg "Cancelling Setup" "Could not connect to the internet to complete setup. Check the internet connection and from Konsole run lh_system_start.sh." && exit 1
+        msg "Waiting for internet connectivity..." "Connect to the internet to complete setup."
         ((netwait++))
         sleep 5
     done
     msg "Installing apps."
     konsole -e /bin/bash -i -c "sudo pacman -Syyy --noconfirm archlinux-keyring && sudo pacman -Syyy --noconfirm mythtv mythplugins-mytharchive mythplugins-mythmusic mythplugins-mythweb && flatpak install tv.plex.PlexHTPC --noninteractive --assumeyes && sudo flatpak override tv.plex.PlexHTPC --filesystem=/run/lirc/lircd"
     status=$?
-    [ $status -eq 1 ] && msg "Could not install apps. Check internet connection. Cancelling Setup." && exit 1
+    [ $status -eq 1 ] && msg "Cancelling Setup" "Could not connect to the internet to complete setup. Check the internet connection and from Konsole run lh_system_start.sh." && exit 1
     gen_lib_xml.py
 }
 
@@ -88,16 +88,16 @@ function localweb_setup(){
 function first_configure(){
     if [ ! -f ~/.config/lh_configured ]; then
         msg "New install of LinHES. Starting setup."
-        install_lh_apps
-        nanorc_setup
-        bashrc_setup
-        x11vnc_setup
         if [ -f /etc/systemconfig ]; then
             SystemType=$(grep SystemType= /etc/systemconfig | cut -d '"' -f 2)
         else
             SystemType=$(kdialog --title "LinHES System Type" --combobox "Select the LinHES System Type:                               " "MasterBackend" "FrontendOnly" "DesktopOnly" --default "MasterBackend")
             echo "SystemType=\"$SystemType\"" | sudo tee /etc/systemconfig
         fi
+        install_lh_apps
+        nanorc_setup
+        bashrc_setup
+        x11vnc_setup
         #apply settings for specific system types
         msg "Setup as $SystemType"
         if [ $SystemType = "MasterBackend" ]; then