From 150d7aadbc3a093f497f66cfdb00ede93912e866 Mon Sep 17 00:00:00 2001
From: zhangsz <zhangsz@omc.com>
Date: Tue, 15 Apr 2025 11:42:08 +0800
Subject: [PATCH] feat: psap portal

---
 bin/build.sh   |  8 ++++----
 bin/makepkg.sh | 21 ++++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/bin/build.sh b/bin/build.sh
index a43adbf..c9c1d26 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
 
 usage() {
-    echo "Usage: $0 [OPTION] deb|badeb|rpm|psap"
+    echo "Usage: $0 [OPTION] deb|badeb|rpm|psapdeb"
     echo 
     echo "Build omc package, option as follow:"
     echo "  deb|badeb|rpm,              deb: ubuntu|debian package build by dpkg"
     echo "                              badeb: ubuntu|debian package build by dpkg"
     echo "                              rpm: centos/redhat package, build by rpmbuild"
-    echo "  psap                        psap package, build by dpkg"
+    echo "  psapdeb                     psap package, build by dpkg"
     echo 
     echo "  -r, =build root directory   build root directory, default directory is $HOME/omc.git"
     echo "  -d                          dump SQL from database"
-    echo "  -h, --help                 display this help and exit"
+    echo "  -h, --help                  display this help and exit"
     echo  
 }
 
@@ -354,7 +354,7 @@ case "${pkgtype}" in
         md5sum ${DebPkgName} >omc-md5sum.txt
         echo "Finish to make ${pkgtype} package <======"        
     ;;    
-    psap)
+    psapdeb)
         ProjectL="psap"
         echo "Begin to make ${pkgtype} package ======>"
         ReleasePkgDir=${ReleaseDir}/debs/${RelArch}
diff --git a/bin/makepkg.sh b/bin/makepkg.sh
index 09fcb01..a27836f 100755
--- a/bin/makepkg.sh
+++ b/bin/makepkg.sh
@@ -11,12 +11,19 @@ usage() {
     echo "  -m, =be|fe|all              be: only process back-end code, default if non input"
     echo "                              fe: only process front-end code"
     echo "                              all: process all include be and fe" 
-    echo "  -c, =ba                     ba: customized for BA OMC"
+    echo "  -c, =ba|psap                ba: customized for BA OMC, psap: customized for PSAP Portal"
 }
 
 pkgtype=""
 new_args=()
 be_args=()
+
+handle_invalid_option() {
+    echo "Invalid option: -$1" >&2
+    usage
+    exit 2
+}
+
 # Traverse all parameters
 for arg in "$@"; do
     if [[ "$arg" == "deb" || "$arg" == "rpm" ]]; then
@@ -54,19 +61,15 @@ while getopts "m:r:c:d" option; do
             if [ "${c_arg}" == "ba" ]; then
                 pkgtype="badeb"
                 be_args+=("${pkgtype}")
-            else if [ "${c_arg}" == "psap" ]; then
+            elif [ "${c_arg}" == "psap" ]; then
                 pkgtype="psapdeb"
                 be_args+=("${pkgtype}")
             else
-                echo "Invalid option: -$OPTARG" >&2
-                usage
-                exit 2
-            fi        
+                handle_invalid_option "$OPTARG"
+            fi
         ;;        
         \?)
-            echo "Invalid option: -$OPTARG" >&2
-            usage
-            exit 2
+            handle_invalid_option "$OPTARG"
         ;;
     esac
 done