From 7cac1e1249b248a10c78581a3dcbb08464dbb288 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Sat, 19 Apr 2025 15:53:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96setup.sh=E5=92=8Comc.s?=
 =?UTF-8?q?pec=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 linux/usr/local/etc/omc/script/setup.sh | 69 +++++++++----------------
 pkg/rpm/SPECS/omc.spec                  | 54 ++++++++-----------
 2 files changed, 45 insertions(+), 78 deletions(-)

diff --git a/linux/usr/local/etc/omc/script/setup.sh b/linux/usr/local/etc/omc/script/setup.sh
index 9f79661..df2666d 100644
--- a/linux/usr/local/etc/omc/script/setup.sh
+++ b/linux/usr/local/etc/omc/script/setup.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
-set -e
-set -x
+
 OMCBinFile=/usr/local/bin/omc
 OMCEtcDir=/usr/local/etc/omc
 confFile=$OMCEtcDir/omc.yaml
@@ -94,55 +93,33 @@ if [ -n "$C_PARAM" ]; then
 fi
 # echo "Customize parameter: $VENDORS"
 
-# ========================= Reject non-specified pattern data
-case "$T_PARAM" in
-  "install")
-    case "$T_PARAM" in
-      "std")
-        if ! command -v mysql &>/dev/null && ! command -v mariadb &>/dev/null; then
-            echo "MySQL or MariaDB not installed"
-            exit 1
-        fi
-        rm -rf $OMCEtcDir/database/lite
-        rm -rf $OMCEtcDir/default/omc_db.sqlite
-        ;;
-      "lite")
-        rm -rf $OMCEtcDir/database/std
-        cp -rf $OMCEtcDir/default/omc_db.sqlite $OMCEtcDir/database/omc_db.sqlite
-        ;;
-    esac
-    ;;
-  "upgrade")
-    case "$T_PARAM" in
-      "std")
-        rm -rf $OMCEtcDir/database/lite
-        rm -rf $OMCEtcDir/default/omc_db.sqlite
-        ;;
-      "lite")
-        rm -rf $OMCEtcDir/database/std
-        ;;
-    esac
-    ;;
-esac
+# ========================= Specify the mode pre-determination
+if [[ "$T_PARAM" == "install" ]]; then
+	case "$MODE" in
+    std)
+      if ! command -v mysql &>/dev/null && ! command -v mariadb &>/dev/null; then
+          echo "MySQL or MariaDB not installed"
+          exit 1
+      fi
+      ;;
+    lite)
+      cp -rf $OMCEtcDir/default/omc_db.sqlite $OMCEtcDir/database/omc_db.sqlite
+      ;;
+  esac
+fi
+
 
 # ========================= Execute the catalog sql file according to the schema
 $OMCBinFile -c $confFile --sqlPath $OMCEtcDir/database/$MODE/$T_PARAM --sqlSource $MODE
 
 
 # ========================= Customize
-case "$T_PARAM" in
-  "install")
-    if [[ -d $OMCEtcDir/vendor ]]; then
-      cp -rf $OMCEtcDir/vendor/$VENDORS/web/* $OMCEtcDir/web/background
-      cp -rf $OMCEtcDir/vendor/$VENDORS/static/* /usr/local/omc/static
-      $OMCBinFile -c $confFile --sqlPath $OMCEtcDir/vendor/$VENDORS/database/$MODE/$T_PARAM --sqlSource $MODE
-    fi
-    ;;
-  "upgrade")
-    if [[ -d $OMCEtcDir/vendor ]]; then
-      $OMCBinFile -c $confFile --sqlPath $OMCEtcDir/vendor/$VENDORS/database/$MODE/$T_PARAM --sqlSource $MODE
-    fi
-    ;;
-esac
+if [[ -d $OMCEtcDir/vendor ]]; then
+  if [[ "$T_PARAM" == "install" ]]; then
+    cp -rf $OMCEtcDir/vendor/$VENDORS/web/* $OMCEtcDir/web/background
+    cp -rf $OMCEtcDir/vendor/$VENDORS/static/* /usr/local/omc/static
+  fi
+  $OMCBinFile -c $confFile --sqlPath $OMCEtcDir/vendor/$VENDORS/database/$MODE/$T_PARAM --sqlSource $MODE
+fi
 
 # bash setup.sh -i -m std -c omc
diff --git a/pkg/rpm/SPECS/omc.spec b/pkg/rpm/SPECS/omc.spec
index f94b905..88acdbb 100644
--- a/pkg/rpm/SPECS/omc.spec
+++ b/pkg/rpm/SPECS/omc.spec
@@ -2,33 +2,34 @@ Name: omc
 Version: {version}
 Release: {date}
 Summary: OMC-Team
-
 License: GPL
 Group: Applications/Communications
 BuildArch: {arch}
 
 
-# 软件说明
+# Software Description    ========
 %description
 OMC is a management application for the 5GC core network.
 
 
-# 打包前脚本    ========
+# Pre-Packaging Script    ========
 %prep
 rm -rf ${RPM_BUILD_ROOT} && mkdir -p ${RPM_BUILD_ROOT}
 cp -rf ${RPM_BUILD_DIR}/* ${RPM_BUILD_ROOT}/
 chmod 644 ${RPM_BUILD_ROOT}/usr/local/etc/omc/web/wiregasm/wiregasm.wasm
 
-# 安装前脚本    ========
+
+# Pre-Installation Scripts    ========
 %pre
 rm -rf /usr/local/etc/omc/default
 
 
-# 安装后脚本    ========
+# Post-Installation Scripts    ========
 %post
 RootDir=/usr/local/etc/omc
 
-# 执行安装后配置
+
+# Perform post-installation configuration
 echo ""
 echo "Output: $RootDir"
 echo "Please Run:"
@@ -81,50 +82,39 @@ else
     systemctl start omc.service
     systemctl start sshsvc.service
 fi
-
-# rm -rf $RootDir/vendor
+echo ""
 
 
-# 卸载前脚本    ========
+# Pre-uninstallation script    ========
 %preun
-# 停止服务
+# Stop Service
 systemctl daemon-reload
 systemctl stop omc.service
 systemctl stop sshsvc.service
 
 
-# 卸载后脚本    ========
+# Post-uninstallation script    ========
 %postun
 case "$1" in
   0)
-    # 卸载操作
+    # Uninstallation operations
     
-    # 删除服务文件
-    # systemctl daemon-reload
-    # systemctl disable omc.service
-    # systemctl disable sshsvc.service
-    # rm -rf /lib/systemd/system/omc.service
-    # rm -rf /lib/systemd/system/sshsvc.service
-    # systemctl daemon-reload
+    # Deletion of service files
+    rm -rf /lib/systemd/system/omc.service
+    rm -rf /lib/systemd/system/sshsvc.service
+    systemctl daemon-reload
 
-    # 移除相关文件
-    # rm -rf /usr/local/bin/omc
-    # rm -rf /usr/local/etc/omc
-
-    rm -rf /usr/local/etc/omc/{*.yaml,*.conf}
-    DB_DIR="/usr/local/etc/omc/database"
-    rm -rf $DB_DIR/omc_db.sqlite
-    if [[ -d "$DB_DIR" && -z "$(ls -A "$DB_DIR")" ]]; then
-      rm -r "$DB_DIR"
-    fi
+    # Removal of relevant documents
+    rm -rf /usr/local/bin/omc
+    rm -rf /usr/local/etc/omc
     ;;
   1)
-    # 更新操作
+    # Update Operation
     ;;
 esac
 
 
-# 包含的文件    ========
+# Included documents    ========
 %files
 %defattr(-,root,root,-)
 /lib/systemd/system/*
@@ -133,7 +123,7 @@ esac
 /usr/local/omc/*
 
 
-# 更新日志      ========
+# Update Log      ========
 %changelog
 * Wed Jan 01 2025 omc <omc@example.com> - {version}
 - Build package {date}.