Skip to content

Commit

Permalink
fixed: only first service is uninstalled
Browse files Browse the repository at this point in the history
  • Loading branch information
kwindrem committed Apr 13, 2024
1 parent 21f2dde commit 475fe8a
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 12 deletions.
6 changes: 3 additions & 3 deletions HelperResources/CommonResources
Original file line number Diff line number Diff line change
Expand Up @@ -1012,10 +1012,10 @@ 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
Expand Down Expand Up @@ -1048,7 +1048,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
Expand Down
2 changes: 1 addition & 1 deletion blindInstall/SetupHelperVersion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.0~17
v8.0~18
1 change: 1 addition & 0 deletions changes
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ v8.0: (beta)
add TailscaleGX to default package list
fixed: PackageManager hangs if there is no setup script in package directory
fixed: package conflict message disappears
fixed: only first service is uninstalled

v7.17:
services not always uninstalled
Expand Down
10 changes: 3 additions & 7 deletions updatePackage
Original file line number Diff line number Diff line change
Expand Up @@ -1169,22 +1169,18 @@ for package in $packageList; do
# convert old name formats
oldPath="$patchSourceDir/$baseName"
newPath="$oldPath-1"
if [ -e "$oldPath.source" ] || [ -e "$oldPath.edited" ] || [ -e "$oldPath.patch" ]; then
if [ -e "$oldPath.source" ] || [ -e "$oldPath.edited" ]; then
if [ -e "$newPath*" ]; then
logMessage "can't move .source and .edited patch files - ...-1... already exists"
else
if [ -e "$oldPath.source" ]; then
logMessage " renaming $baseName.source to $baseName-1.orig"
logMessage " renaming $baseName.source to $baseName.orig"
mv "$oldPath.source" "$newPath.orig"
fi
if [ -e "$oldPath.edited" ]; then
logMessage " renaming $baseName.edited to $baseName-1"
logMessage " renaming $baseName.edited to $baseName"
mv "$oldPath.edited" "$newPath"
fi
if [ -e "$oldPath.patch" ]; then
logMessage " renaming $baseName.patch to $baseName-1.patch"
mv "$oldPath.patch" "$newPath.patch"
fi
fi
fi

Expand Down
Binary file modified venus-data-UninstallPackages.tgz
Binary file not shown.
Binary file modified venus-data.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.0~17
v8.0~18

0 comments on commit 475fe8a

Please sign in to comment.