From 5b05152f9a24284e4c843a90269efcf9786a32ba Mon Sep 17 00:00:00 2001
From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com>
Date: Mon, 10 Jul 2023 14:56:52 +0800
Subject: [PATCH] feat: optimize scripts

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
---
 CHANGELOG/.chglog/config.yml  |  1 +
 scripts/build_all_service.sh  | 13 ++++++++++---
 scripts/msg_gateway_start.sh  | 14 +++++++-------
 scripts/msg_transfer_start.sh | 14 +++++++-------
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG/.chglog/config.yml b/CHANGELOG/.chglog/config.yml
index 1eed7863b..fe6214ab9 100644
--- a/CHANGELOG/.chglog/config.yml
+++ b/CHANGELOG/.chglog/config.yml
@@ -1,3 +1,4 @@
+bin: git
 style: github
 template: CHANGELOG.tpl.md
 info:
diff --git a/scripts/build_all_service.sh b/scripts/build_all_service.sh
index fd196e48b..5aea8b1d9 100755
--- a/scripts/build_all_service.sh
+++ b/scripts/build_all_service.sh
@@ -13,10 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+#Include shell font styles and some basic information
+SCRIPTS_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+
+cd $SCRIPTS_ROOT
+
+#Include shell font styles and some basic information
+source $SCRIPTS_ROOT/style_info.sh
+source $SCRIPTS_ROOT/path_info.sh
+source $SCRIPTS_ROOT/function.sh
 
-source ./style_info.sh
-source ./path_info.sh
-source ./function.sh
 echo -e  ""
 
 echo -e "${BACKGROUND_BLUE}===============> Building all using make build binary files ${COLOR_SUFFIX}" 
diff --git a/scripts/msg_gateway_start.sh b/scripts/msg_gateway_start.sh
index 164d993ae..b3b71d220 100755
--- a/scripts/msg_gateway_start.sh
+++ b/scripts/msg_gateway_start.sh
@@ -51,9 +51,9 @@ if [ ${#rpc_ports[@]} -ne ${#ws_ports[@]} ]; then
 fi
 #Check if the service exists
 #If it is exists,kill this process
-check=$(ps aux | grep -w ./${openim-msggateway} | grep -v grep | wc -l)
+check=$(ps aux | grep -w ./${openim_msggateway} | grep -v grep | wc -l)
 if [ $check -ge 1 ]; then
-  oldPid=$(ps aux | grep -w ./${openim-msggateway} | grep -v grep | awk '{print $2}')
+  oldPid=$(ps aux | grep -w ./${openim_msggateway} | grep -v grep | awk '{print $2}')
     kill -9 ${oldPid}
 fi
 #Waiting port recycling
@@ -61,23 +61,23 @@ sleep 1
 cd ${msg_gateway_binary_root}
 for ((i = 0; i < ${#ws_ports[@]}; i++)); do
   echo "==========================start msg_gateway server===========================">>$OPENIM_ROOT/logs/openIM.log
-  nohup ./${openim-msggateway} --port ${rpc_ports[$i]} --ws_port ${ws_ports[$i]} --prometheus_port ${prome_ports[$i]} >>$OPENIM_ROOT/logs/openIM.log 2>&1 &
+  nohup ./${openim_msggateway} --port ${rpc_ports[$i]} --ws_port ${ws_ports[$i]} --prometheus_port ${prome_ports[$i]} >>$OPENIM_ROOT/logs/openIM.log 2>&1 &
 done
 
 #Check launched service process
 sleep 3
-check=$(ps aux | grep -w ./${openim-msggateway} | grep -v grep | wc -l)
+check=$(ps aux | grep -w ./${openim_msggateway} | grep -v grep | wc -l)
 allPorts=""
 if [ $check -ge 1 ]; then
-  allNewPid=$(ps aux | grep -w ./${openim-msggateway} | grep -v grep | awk '{print $2}')
+  allNewPid=$(ps aux | grep -w ./${openim_msggateway} | grep -v grep | awk '{print $2}')
   for i in $allNewPid; do
     ports=$(netstat -netulp | grep -w ${i} | awk '{print $4}' | awk -F '[:]' '{print $NF}')
       allPorts=${allPorts}"$ports "
   done
   echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS"${COLOR_SUFFIX}
-  echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${openim-msggateway}${COLOR_SUFFIX}
+  echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${openim_msggateway}${COLOR_SUFFIX}
   echo -e ${SKY_BLUE_PREFIX}"PID: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${allNewPid}${COLOR_SUFFIX}
   echo -e ${SKY_BLUE_PREFIX}"LISTENING_PORT: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${allPorts}${COLOR_SUFFIX}
 else
-  echo -e ${BACKGROUND_GREEN}${openim-msggateway}${COLOR_SUFFIX}${RED_PREFIX}"\n SERVICE START ERROR, PLEASE CHECK openIM.log"${COLOR_SUFFIX}
+  echo -e ${BACKGROUND_GREEN}${openim_msggateway}${COLOR_SUFFIX}${RED_PREFIX}"\n SERVICE START ERROR, PLEASE CHECK openIM.log"${COLOR_SUFFIX}
 fi
diff --git a/scripts/msg_transfer_start.sh b/scripts/msg_transfer_start.sh
index 741485356..541c82910 100755
--- a/scripts/msg_transfer_start.sh
+++ b/scripts/msg_transfer_start.sh
@@ -40,10 +40,10 @@ prome_ports=($ports_array)
 
 #Check if the service exists
 #If it is exists,kill this process
-check=`ps aux | grep -w ./${openim-msgtransfer} | grep -v grep| wc -l`
+check=`ps aux | grep -w ./${openim_msgtransfer} | grep -v grep| wc -l`
 if [ $check -ge 1 ]
 then
-oldPid=`ps aux | grep -w ./${openim-msgtransfer} | grep -v grep|awk '{print $2}'`
+oldPid=`ps aux | grep -w ./${openim_msgtransfer} | grep -v grep|awk '{print $2}'`
  kill -9 $oldPid
 fi
 #Waiting port recycling
@@ -52,7 +52,7 @@ sleep 1
 cd ${msg_transfer_binary_root}
 for ((i = 0; i < ${msg_transfer_service_num}; i++)); do
       prome_port=${prome_ports[$i]}
-      cmd="nohup ./${openim-msgtransfer}"
+      cmd="nohup ./${openim_msgtransfer}"
       if [ $prome_port != "" ]; then
         cmd="$cmd --prometheus_port $prome_port"
       fi
@@ -61,15 +61,15 @@ for ((i = 0; i < ${msg_transfer_service_num}; i++)); do
 done
 
 #Check launched service process
-check=`ps aux | grep -w ./${openim-msgtransfer} | grep -v grep| wc -l`
+check=`ps aux | grep -w ./${openim_msgtransfer} | grep -v grep| wc -l`
 if [ $check -ge 1 ]
 then
-newPid=`ps aux | grep -w ./${openim-msgtransfer} | grep -v grep|awk '{print $2}'`
+newPid=`ps aux | grep -w ./${openim_msgtransfer} | grep -v grep|awk '{print $2}'`
 allPorts=""
     echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS "${COLOR_SUFFIX}
-    echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${openim-msgtransfer}${COLOR_SUFFIX}
+    echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${openim_msgtransfer}${COLOR_SUFFIX}
     echo -e ${SKY_BLUE_PREFIX}"PID: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${newPid}${COLOR_SUFFIX}
     echo -e ${SKY_BLUE_PREFIX}"LISTENING_PORT: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${allPorts}${COLOR_SUFFIX}
 else
-    echo -e ${BACKGROUND_GREEN}${openim-msgtransfer}${COLOR_SUFFIX}${RED_PREFIX}"\n SERVICE START ERROR, PLEASE CHECK openIM.log"${COLOR_SUFFIX}
+    echo -e ${BACKGROUND_GREEN}${openim_msgtransfer}${COLOR_SUFFIX}${RED_PREFIX}"\n SERVICE START ERROR, PLEASE CHECK openIM.log"${COLOR_SUFFIX}
 fi