various updates - see description

fixed: "Once" download scan doesn't check all packages fixed: package checks run unnecessarily until time syncs with NTP after an unclean shutdown base script prechecks on file modificaiton times to eliminate unnecessary work setupHelper uninstall and reboots/gui restarts moved from PackageManager main to separate script add TailscaleGX to default package list updatePackage: changed HelperResources version checking to minimize prompts
kwindrem · Apr 23, 2024 · 288f82a · 288f82a
1 parent dd7d9ca
commit 288f82a
Show file tree

Hide file tree

Showing 13 changed files with 396 additions and 318 deletions.
diff --git a/FileSets/VersionIndependent/PageSettingsPackageEdit.qml b/FileSets/VersionIndependent/PageSettingsPackageEdit.qml
@@ -217,13 +217,9 @@ MbPage {
 		else if (showActionNeeded)
 		{
 			if (actionNeeded.indexOf ( "REBOOT" ) != -1 )
-			{
 				sendCommand ( 'reboot', true )
-			}
 			else if (actionNeeded.indexOf ( "restart" ) != -1 )
-			{
 				sendCommand ( 'restartGui', true )
-			}
 		}
 		requestedAction = ''
 	}

diff --git a/FileSets/VersionIndependent/PageSettingsPackageManager.qml b/FileSets/VersionIndependent/PageSettingsPackageManager.qml
@@ -82,22 +82,22 @@ MbPage {
              {
 				if (! actionNeeded.valid)
 					return ""
-				else if (actionNeeded.value == 'reboot')
+				else if (actionNeeded.value.indexOf ( "REBOOT" ) != -1 )
 					return qsTr ("Reboot")
-				else if (actionNeeded.value == 'guiRestart')
+				else if (actionNeeded.value.indexOf ( "restart" ) != -1 )
 					return qsTr ("Restart GUI")
 				else
 					return ""
 			}
 			onClicked:
             {
-				if (actionNeeded.value == 'reboot')
+				if (finishButton.value == 'REBOOT')
 				{
 					// needs immediate update because GUI will be going down ASAP
 					finishButton.description = qsTr ("REBOOTING ...")
 					editAction.setValue ( 'reboot' )
 				}
-				else if (actionNeeded.value == 'guiRestart')
+				else if (finishButton.value == 'guiRestart')
 				{
 					// needs immediate update because GUI will be going down ASAP
 					finishButton.description = qsTr ("restarting GUI ...")

diff --git a/HelperResources/CommonResources b/HelperResources/CommonResources
@@ -1351,45 +1351,45 @@ deferGuiRestart=false
 userInteraction=true
 runFromPm=false
 while [ $# -gt 0 ]; do
-        case $1 in
-            "reinstall")
-                reinstall=true
-                ;;
-            "force")
-                force=true
-                ;;
-            "deferReboot")
-                deferReboot=true
-                ;;
-            "deferGuiRestart")
-                deferGuiRestart=true
-                ;;
-            "install")
-                scriptAction='INSTALL'
-                ;;
-            "uninstall")
-                scriptAction='UNINSTALL'
-                ;;
-            "auto")
-                logToConsole=false
-				userInteraction=false
-                ;;
-            "runFromPm")
-				runFromPm=true
-                logToConsole=false
-				userInteraction=false
-                deferReboot=true
-                deferGuiRestart=true
-                ;;
-            "check")
-				# if no other actions were set, set it here
-				#	but allow other actions to override this one
-				if [ $scriptAction == 'NONE' ]; then
-					scriptAction='CHECK'
-				fi
-                ;;
-            *)
-        esac
+	case $1 in
+		"reinstall")
+			reinstall=true
+			;;
+		"force")
+			force=true
+			;;
+		"deferReboot")
+			deferReboot=true
+			;;
+		"deferGuiRestart")
+			deferGuiRestart=true
+			;;
+		"install")
+			scriptAction='INSTALL'
+			;;
+		"uninstall")
+			scriptAction='UNINSTALL'
+			;;
+		"auto")
+			logToConsole=false
+			userInteraction=false
+			;;
+		"runFromPm")
+			runFromPm=true
+			logToConsole=false
+			userInteraction=false
+			deferReboot=true
+			deferGuiRestart=true
+			;;
+		"check")
+			# if no other actions were set, set it here
+			#	but allow other actions to override this one
+			if [ $scriptAction == 'NONE' ]; then
+				scriptAction='CHECK'
+			fi
+			;;
+		*)
+	esac
     shift
 done
 

diff --git a/HelperResources/version b/HelperResources/version
@@ -1 +1 @@
-v8.0~20
+v8.0~23