Smaller Changes / Code cleanup

system_setup/logon_script.sh

@@ -4,8 +4,7 @@
 #
 # User logon script for KDE Environement
 #
-source ./setup_system.conf
-source ./setup_system.inc.sh
+source $(dirname "$0")/setup_system.inc.sh
 
 elog_init "User Logon Script"
 elog_add "=================="
@@ -50,11 +49,7 @@ fi
 get_nc_token
 elog_add "Successfully obtained Token for User ${DAVTOKEN_USER}"
 
-#SYNC Firefox + Thunderbird Profile
-./mozilla_starter.sh firefox sync && ./mozilla_starter.sh thunderbird sync
-elog_add "Successfully synced Mozilla profiles (log in another file)."
-
-#Install additional Software
+#Install Software
 elog_add "==="
 elog_add "Update and install client Software"
 # Without sudoers-rule for run without asking for password, it won't run and quit complaining about not askpass utilities found
@@ -72,6 +67,10 @@ if [[ $INST_RET -ne 0 ]]; then
     fi
 fi
 
+#SYNC Firefox + Thunderbird Profile
+./mozilla_starter.sh firefox sync && ./mozilla_starter.sh thunderbird sync
+elog_add "Successfully synced Mozilla profiles (log in another file)."
+
 elog_add "Sucessfully run logon script (Wait 3 seconds)"
 sleep 3