From 23a51956cade888438d1a13f7cebe2f9e1b451dc Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Sat, 19 Apr 2025 12:21:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20rpm=E4=BF=9D=E7=95=99vendor=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E5=8D=B8=E8=BD=BD=E9=94=99=E8=AF=AF=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/linux/usr/local/etc/omc/script/setup.sh b/linux/usr/local/etc/omc/script/setup.sh
index 27abe15..9f79661 100644
--- a/linux/usr/local/etc/omc/script/setup.sh
+++ b/linux/usr/local/etc/omc/script/setup.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-
+set -e
+set -x
 OMCBinFile=/usr/local/bin/omc
 OMCEtcDir=/usr/local/etc/omc
 confFile=$OMCEtcDir/omc.yaml
diff --git a/pkg/rpm/SPECS/omc.spec b/pkg/rpm/SPECS/omc.spec
index d5b76b7..f94b905 100644
--- a/pkg/rpm/SPECS/omc.spec
+++ b/pkg/rpm/SPECS/omc.spec
@@ -82,7 +82,7 @@ else
     systemctl start sshsvc.service
 fi
 
-rm -rf $RootDir/vendor/*
+# rm -rf $RootDir/vendor
 
 
 # 卸载前脚本    ========
@@ -112,7 +112,11 @@ case "$1" in
     # rm -rf /usr/local/etc/omc
 
     rm -rf /usr/local/etc/omc/{*.yaml,*.conf}
-    rm -rf /usr/local/etc/omc/database/omc_db.sqlite
+    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
     ;;
   1)
     # 更新操作