Skip to content

Commit

Permalink
fix blindInstall bug
Browse files Browse the repository at this point in the history
blindInstall failed of SetupHelper was already installed.
  • Loading branch information
kwindrem committed Nov 18, 2021
1 parent ada9eaf commit 8726ab2
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 15 deletions.
Binary file modified .DS_Store
Binary file not shown.
16 changes: 2 additions & 14 deletions ServiceResources
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
# functions that begin with _ skip checks and do not log activity


# _killServiceProcesses makes sure there are no service processes running
# The intent is to force supervise to run the new version
# must be called from other functions that have already made the necessary checks

# starting with v2.80~10, services are stored in this directory which is overlayed onto /service
# all services need to be added there rather than /service
# Note: service calls (eg svc) are still made on /service/...
Expand All @@ -34,12 +30,6 @@ else
serviceOverlay=false
fi

_killServiceProcesses ()
{
local pkg=$1
ps -lw | grep $pkg | grep -v -e grep -e $$ | awk '{print $3}' | xargs kill > /dev/null 2>&1
}

# startService and stopService start and stop the service, respectively
# the 'down' flag is also cleared/set to control service runs in the future
# startService will cause the service to stop then start again !!!
Expand All @@ -50,6 +40,7 @@ _startService ()
rm -f "$serviceDir/$pkg/down"
if $serviceOverlay ; then
rm -f "/service/$pkg/down"
svc -u "/service/$pkg"
fi
svc -u "/service/$pkg"
if [ -e "$serviceDir/$pkg/log" ]; then
Expand Down Expand Up @@ -82,7 +73,6 @@ _stopService ()
touch "$serviceDir/$pkg/log/down"
svc -d "/service/$pkg/log"
fi
_killServiceProcesses $pkg
}

stopService ()
Expand Down Expand Up @@ -116,8 +106,6 @@ _removeService ()
if $serviceOverlay ; then
rm -rf "$overlayWorkDir/$pkg"
fi
# kill related processes
_killServiceProcesses $pkg
}

removeService ()
Expand Down Expand Up @@ -181,8 +169,8 @@ installService ()
cp "$scriptDir/service/log/run" "$serviceDir/$pkg/log/run"
fi
fi
_killServiceProcesses $pkg
fi
_startService $pkg
}


Expand Down
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 @@
v3.9
v3.10

0 comments on commit 8726ab2

Please sign in to comment.