From e4c59cf28ffe756f3e7805a62c4ba6789069a0f2 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Sat, 12 Oct 2024 18:45:37 +0800
Subject: [PATCH] update omc service and setomc shell script

---
 misc/omcsvc.sh | 15 ++++++++++-----
 misc/setomc.sh | 50 +++++++++++++++++++++++++-------------------------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/misc/omcsvc.sh b/misc/omcsvc.sh
index 037a27b1..8e88b2fe 100644
--- a/misc/omcsvc.sh
+++ b/misc/omcsvc.sh
@@ -8,8 +8,11 @@ BinDir=/usr/local/omc/bin
 case "$1" in
         start)
             for procName in $ProcListDesc;do
-                echo  "Starting $procName process  ..."
+                echo -n "Starting $procName process  ... "
                 systemctl start $procName
+                if [ $? = 0 ]; then
+                    echo "done" 
+                fi 
                 sleep 1
             done
         ;;
@@ -20,8 +23,11 @@ case "$1" in
         ;;
         stop)
             for procName in $ProcList;do
-               echo  "Stopping $procName process  ..."
-               systemctl stop $procName
+                echo -n "Stopping $procName process  ... "
+                systemctl stop $procName
+                if [ $? = 0 ]; then
+                    echo "done" 
+                fi 
             done
         ;;
         restart)
@@ -38,5 +44,4 @@ case "$1" in
                 echo "OMC service"
                 echo "Usage: $0 start|status|stop|restart|version"
         ;;
-esac            
-                                                                                                                                                                                                                                                                                                        
+esac     
diff --git a/misc/setomc.sh b/misc/setomc.sh
index d3fd3bf1..d1c83353 100644
--- a/misc/setomc.sh
+++ b/misc/setomc.sh
@@ -25,14 +25,14 @@ check_args() {
             m)  
                 M_ARG=$(echo $OPTARG | tr '[:upper:]' '[:lower:]')
                 if [ "${VENDORS}" == "BA" ]; then
-                       C_ARG_LOWER="ba"
-                       C_ARG_UPPER="BA"
+                    C_ARG_LOWER="ba"
+                    C_ARG_UPPER="BA"
                 fi
                 ;;  
             \?) 
                 echo "Invalid option: -$OPTARG" >&2
                 ;;  
-       esac
+        esac
    done
 }
 
@@ -54,19 +54,19 @@ case "${M_ARG}" in
         ${OMCBinDir}/importdb.sh ${M_ARG}
 
         if [ "${C_ARG_LOWER}" != "" ]; then
-           CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d
-           if [ ! -d "${CustomizedDir}" ]; then
-               echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done"
-               exit 1
-           fi  
+            CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d
+            if [ ! -d "${CustomizedDir}" ]; then
+                echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done"
+                exit 1
+            fi  
             echo -n "Setting ${C_ARG_UPPER} customized OMC ..."
-           for SQL in ${CustomizedDir}/db/*.sql; do  
-                   mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
-           done
-           cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
-           cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
-           #perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml
-           #perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCBinDir}/nehosts
+            for SQL in ${CustomizedDir}/db/*.sql; do  
+                mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
+            done
+            cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
+            cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
+            #perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml
+            #perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCBinDir}/nehosts
             if [ $? = 0 ]; then
                	echo "done" 
             fi 
@@ -77,17 +77,17 @@ case "${M_ARG}" in
         ;;
     skip)
         if [ "${C_ARG_LOWER}" != "" ]; then
-           CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d
-           if [ ! -d "${CustomizedDir}" ]; then
-               echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done"
-               exit 1
-           fi  
+            CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d
+            if [ ! -d "${CustomizedDir}" ]; then
+                echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done"
+                exit 1
+            fi  
             echo -n "Setting ${C_ARG_UPPER} customized OMC ..."
-           for SQL in ${CustomizedDir}/db/*.sql; do  
-                   mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
-           done
-           cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
-           cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
+            for SQL in ${CustomizedDir}/db/*.sql; do  
+                mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
+            done
+            cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
+            cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
             if [ $? = 0 ]; then
                	echo "done" 
             fi