From ae28c958d573a78dba02932ddd8025fc97f24510 Mon Sep 17 00:00:00 2001
From: haoranchen <haoran920c@163.com>
Date: Tue, 14 Jan 2025 11:44:06 +0800
Subject: [PATCH 1/5] fix: use ps -C to find process pid

---
 packaging/tools/remove.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index 5bbfd2a0de..77d46627a7 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -90,7 +90,7 @@ fi
 
 kill_service_of() {
   _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
     ${csudo}kill -9 $pid || :
   fi
@@ -140,9 +140,8 @@ clean_service_of() {
     clean_service_on_systemd_of $_service
   elif ((${service_mod} == 1)); then
     clean_service_on_sysvinit_of $_service
-  else
-    kill_service_of $_service
   fi
+  kill_service_of $_service
 }
 
 remove_service_of() {

From 6e71f41e8c2c0e86f0acac1a989e45a67e04b142 Mon Sep 17 00:00:00 2001
From: haoranchen <haoran920c@163.com>
Date: Tue, 14 Jan 2025 12:23:59 +0800
Subject: [PATCH 2/5] fix: use ps -C to find process pid

---
 packaging/tools/remove_client.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/tools/remove_client.sh b/packaging/tools/remove_client.sh
index 7798bbf16a..c883fa0af2 100755
--- a/packaging/tools/remove_client.sh
+++ b/packaging/tools/remove_client.sh
@@ -40,7 +40,7 @@ if command -v sudo > /dev/null; then
 fi
 
 function kill_client() {
-    pid=$(ps -C ${clientName2}  | grep -v $uninstallScript2 | awk '{print $2}')
+    pid=$(ps -C ${clientName2}  | gerep -w ${clientName2} | grep -v $uninstallScript2 | awk '{print $1}')
     if [ -n "$pid" ]; then
         ${csudo}kill -9 $pid || :
     fi

From 184162545ba5d7a0ea1186f78315f0b79ccf8fca Mon Sep 17 00:00:00 2001
From: haoranchen <haoran920c@163.com>
Date: Tue, 14 Jan 2025 13:49:27 +0800
Subject: [PATCH 3/5] Update packaging/tools/remove.sh

Co-authored-by: WANG Xu <feici02@outlook.com>
---
 packaging/tools/remove.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index 77d46627a7..6e309f1f67 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -90,7 +90,7 @@ fi
 
 kill_service_of() {
   _service=$1
-  pid=$(ps -C $_service |grep -w $_service |  grep -v $uninstallScript | awk '{print $1}')
+  pid=$(ps -C $_service | grep -w $_service |  grep -v $uninstallScript | awk '{print $1}')
   if [ -n "$pid" ]; then
     ${csudo}kill -9 $pid || :
   fi

From 379be9da02bc8604a2175ad53dd80414db6e4aca Mon Sep 17 00:00:00 2001
From: haoranchen <haoran920c@163.com>
Date: Tue, 14 Jan 2025 13:49:33 +0800
Subject: [PATCH 4/5] Update packaging/tools/remove_client.sh

Co-authored-by: WANG Xu <feici02@outlook.com>
---
 packaging/tools/remove_client.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/tools/remove_client.sh b/packaging/tools/remove_client.sh
index c883fa0af2..3414992ad9 100755
--- a/packaging/tools/remove_client.sh
+++ b/packaging/tools/remove_client.sh
@@ -40,7 +40,7 @@ if command -v sudo > /dev/null; then
 fi
 
 function kill_client() {
-    pid=$(ps -C ${clientName2}  | gerep -w ${clientName2} | grep -v $uninstallScript2 | awk '{print $1}')
+    pid=$(ps -C ${clientName2}  | grep -w ${clientName2} | grep -v $uninstallScript2 | awk '{print $1}')
     if [ -n "$pid" ]; then
         ${csudo}kill -9 $pid || :
     fi

From 318a82f30f7a3f1bf88840255319c2379a3eadec Mon Sep 17 00:00:00 2001
From: WANG Xu <feici02@outlook.com>
Date: Tue, 14 Jan 2025 13:55:23 +0800
Subject: [PATCH 5/5] remove space

---
 packaging/tools/remove.sh        | 2 +-
 packaging/tools/remove_client.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index 6e309f1f67..43c2de4ba4 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -90,7 +90,7 @@ fi
 
 kill_service_of() {
   _service=$1
-  pid=$(ps -C $_service | grep -w $_service |  grep -v $uninstallScript | awk '{print $1}')
+  pid=$(ps -C $_service | grep -w $_service | grep -v $uninstallScript | awk '{print $1}')
   if [ -n "$pid" ]; then
     ${csudo}kill -9 $pid || :
   fi
diff --git a/packaging/tools/remove_client.sh b/packaging/tools/remove_client.sh
index 3414992ad9..1d2965f66b 100755
--- a/packaging/tools/remove_client.sh
+++ b/packaging/tools/remove_client.sh
@@ -40,7 +40,7 @@ if command -v sudo > /dev/null; then
 fi
 
 function kill_client() {
-    pid=$(ps -C ${clientName2}  | grep -w ${clientName2} | grep -v $uninstallScript2 | awk '{print $1}')
+    pid=$(ps -C ${clientName2} | grep -w ${clientName2} | grep -v $uninstallScript2 | awk '{print $1}')
     if [ -n "$pid" ]; then
         ${csudo}kill -9 $pid || :
     fi