xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #29564 from taosdata/fix/main/TD-33489 

fix: use ps -C to find process pid
This commit is contained in:
WANG Xu 2025-01-14 13:56:22 +08:00 committed by GitHub
parent a0bb692b15 318a82f30f
commit 6218888293
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packaging/tools/remove.sh
View File

@ -90,7 +90,7 @@ fi
kill_service_of() { kill_service_of() {
_service=$1 _service=$1
pid=$(ps -C $_service | grep -v $uninstallScript | awk '{print $2}') pid=$(ps -C $_service | grep -w $_service | grep -v $uninstallScript | awk '{print $1}')
if [ -n "$pid" ]; then if [ -n "$pid" ]; then
${csudo}kill -9 $pid || : ${csudo}kill -9 $pid || :
fi fi
@ -140,9 +140,8 @@ clean_service_of() {
clean_service_on_systemd_of $_service clean_service_on_systemd_of $_service
elif ((${service_mod} == 1)); then elif ((${service_mod} == 1)); then
clean_service_on_sysvinit_of $_service clean_service_on_sysvinit_of $_service
else
kill_service_of $_service
fi fi
kill_service_of $_service
} }
remove_service_of() { remove_service_of() {

2
packaging/tools/remove_client.sh
View File

@ -40,7 +40,7 @@ if command -v sudo > /dev/null; then
fi fi
function kill_client() { function kill_client() {
pid=$(ps -C ${clientName2} | grep -v $uninstallScript2 | awk '{print $2}') pid=$(ps -C ${clientName2} | grep -w ${clientName2} | grep -v $uninstallScript2 | awk '{print $1}')
if [ -n "$pid" ]; then if [ -n "$pid" ]; then
${csudo}kill -9 $pid || : ${csudo}kill -9 $pid || :
fi fi