From d0196b38a25e2397ebc133b486f6212a1bef4172 Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Tue, 2 Apr 2024 12:15:58 +0800
Subject: [PATCH] Script Refactoring

---
 scripts-new/{check-all.sh => check.sh} |  3 ++-
 scripts-new/lib/util.sh                | 31 ++++++++++++++++++++++++++
 scripts-new/start.sh                   | 31 ++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)
 rename scripts-new/{check-all.sh => check.sh} (97%)

diff --git a/scripts-new/check-all.sh b/scripts-new/check.sh
similarity index 97%
rename from scripts-new/check-all.sh
rename to scripts-new/check.sh
index b374afa4e..ad3859ad9 100644
--- a/scripts-new/check-all.sh
+++ b/scripts-new/check.sh
@@ -43,12 +43,13 @@ for binary in "${!binaries[@]}"; do
    fi
 done
 
+
+
 for binary in "${!binaries[@]}"; do
   expected_count=${binaries[$binary]}
   base_path=$(get_bin_full_path "$binary")
   for ((i=0; i<expected_count; i++)); do
     full_path="${base_path} -i ${i} -c $OPENIM_OUTPUT_CONFIG"
-    echo "full-path: " $full_path
     check_binary_ports "$full_path"
   done
 done
diff --git a/scripts-new/lib/util.sh b/scripts-new/lib/util.sh
index 8bbd2116c..b4fe00cd2 100644
--- a/scripts-new/lib/util.sh
+++ b/scripts-new/lib/util.sh
@@ -398,6 +398,20 @@ openim::util::check_process_names() {
 }
 
 
+openim::util::check_process_names_exist() {
+    local process_path="$1"
+    local running_count=$(ps -ef | grep "$process_path" | grep -v grep | wc -l)
+
+    if [ "$running_count" -gt 0 ]; then
+        echo 1
+    else
+        echo 0
+    fi
+}
+
+
+
+
 
 
 openim::util::check_process_names_for_stop() {
@@ -2888,6 +2902,23 @@ kill_binary() {
 }
 
 
+kill_exist_binary() {
+    local binary_path="$1"
+       local pids=$(pgrep -f "$binary_path")
+
+       if [ -z "$pids" ]; then
+           echo 0
+           return
+       else
+           for pid in $pids; do
+               echo "Killing process $pid associated with $binary_path"
+               kill -9 "$pid"
+           done
+           echo 1
+       fi
+}
+
+
 
 
 if [[ "$*" =~ openim::util:: ]];then
diff --git a/scripts-new/start.sh b/scripts-new/start.sh
index 288cead6d..195ae4dba 100644
--- a/scripts-new/start.sh
+++ b/scripts-new/start.sh
@@ -27,7 +27,38 @@ start_binaries() {
   done
 }
 
+kill_exist_binaries(){
+  for binary in "${!binaries[@]}"; do
+    full_path=$(get_bin_full_path "$binary")
+    result=$(openim::util::kill_exist_binary "$full_path")
+   if [ "$result" -eq 0 ]; then
+       echo "$binary no exist"
+     else
+       echo "$binary running. waiting stop"
+     fi
+  done
+}
+
+
+check_all_stop() {
+  for binary in "${!binaries[@]}"; do
+    expected_count=${binaries[$binary]}
+    full_path=$(get_bin_full_path "$binary")
+
+    result=$(openim::util::check_process_names_exist "$full_path")
+    if [ "$result" -ne 0 ]; then
+          echo "Process for $binary is still running. Aborting..."
+          exit 1
+        fi
+      done
+      echo "All processes have been stopped."
+}
+
+
+
+kill_exist_binaries
 
+check_all_stop
 
 # Call the main function
 start_binaries