fixed: only first service is uninstalled

kwindrem · Apr 13, 2024 · 81a1bbf · 81a1bbf
1 parent a4680fd
commit 81a1bbf
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/HelperResources/CommonResources b/HelperResources/CommonResources
@@ -922,10 +922,11 @@ installAllServices ()
 	local service
 	# get list of services in the package's service directory
 	if [ -d "$servicesDir" ]; then
-		servicesList=$( cd "$servicesDir"; ls -d * 2> /dev/null )
+		servicesList=( $( cd "$servicesDir"; ls -d * 2> /dev/null ) )
 		if [ ! -z "$servicesList" ]; then
 			logMessage "installing services"
-			for service in $servicesList ; do
+			for service in ${servicesList[@]} ; do
+				if $installFailed; then break; fi
 				installService $service
 			done
 		fi
@@ -957,7 +958,7 @@ uninstallAllServices ()
 	# uninstall services
 	if [ ! -z "$servicesList" ]; then
 		logMessage "uninstalling services"
-		for service in $servicesList ; do
+		for service in ${servicesList[@]} ; do
 			if [ -z "$service" ]; then
 				removeService $packageName
 			else

diff --git a/HelperResources/version b/HelperResources/version
@@ -1 +1 @@
-v7.17
+v7.18
diff --git a/blindInstall/SetupHelperVersion b/blindInstall/SetupHelperVersion
@@ -1 +1 @@
-v7.17
+v7.18
diff --git a/changes b/changes
@@ -1,3 +1,6 @@
+v7.18:
+	fixed: only first service is uninstalled
+
 v7.17:
 	fixed: services not always uninstalled
 

diff --git a/venus-data-UninstallPackages.tgz b/venus-data-UninstallPackages.tgz
diff --git a/venus-data.tgz b/venus-data.tgz
diff --git a/version b/version
@@ -1 +1 @@
-v7.17
+v7.18