From 3a9b4375f42e83ac3ec1ac12efced31f08e1a845 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 19 Mar 2025 19:38:34 +0800
Subject: [PATCH] =?UTF-8?q?ref:=20=E6=9E=84=E5=BB=BA=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.sh                                             | 12 ++++++++----
 build_before.sh                                      |  7 ++++---
 .../etc/omc/database/{ => lite/common}/.gitkeep      |  0
 .../usr/local/etc/omc/database/lite/install/.gitkeep |  0
 .../usr/local/etc/omc/database/lite/upgrade/.gitkeep |  0
 .../local/etc/omc/database/standard/common/.gitkeep  |  0
 .../local/etc/omc/database/standard/install/.gitkeep |  0
 .../local/etc/omc/database/standard/upgrade/.gitkeep |  0
 8 files changed, 12 insertions(+), 7 deletions(-)
 rename linux/usr/local/etc/omc/database/{ => lite/common}/.gitkeep (100%)
 create mode 100644 linux/usr/local/etc/omc/database/lite/install/.gitkeep
 create mode 100644 linux/usr/local/etc/omc/database/lite/upgrade/.gitkeep
 create mode 100644 linux/usr/local/etc/omc/database/standard/common/.gitkeep
 create mode 100644 linux/usr/local/etc/omc/database/standard/install/.gitkeep
 create mode 100644 linux/usr/local/etc/omc/database/standard/upgrade/.gitkeep

diff --git a/build.sh b/build.sh
index 923056c..c83ef21 100755
--- a/build.sh
+++ b/build.sh
@@ -156,17 +156,21 @@ cp -rf ${BuildPackagelDir}/${PACKAGE_MANAGER}/* ${BuildDir}
 if [[ $PACKAGE_MANAGER = "deb" ]]; then
   cp -rf ${BuildLinuxDir}/* ${BuildDir}
   cd ${BuildDir}
-  # 应用处理
-  app
+  # 打包前处理
+  . ./build_before.sh
   # 打包
   deb
+  # 打包后处理
+  . ./build_after.sh
 elif [[ $PACKAGE_MANAGER = "rpm" ]]; then
   cp -rf ${BuildLinuxDir}/* ${BuildDir}/BUILD
   cd ${BuildDir}/BUILD
-  # 应用处理
-  app
+  # 打包前处理
+  . $RootDir/build_before.sh
   # 打包
   rpm
+  # 打包后处理
+  . $RootDir/build_after.sh
 else
   echo "unknown runing: $PACKAGE_MANAGER"
   exit 1
diff --git a/build_before.sh b/build_before.sh
index efe76f1..2e47540 100644
--- a/build_before.sh
+++ b/build_before.sh
@@ -13,7 +13,8 @@ echo "ReleaseFileName: $ReleaseFileName"
 # 数据库脚本 common属于重建脚本
 modeList="standard lite"
 for v in ${modeList}; do
-  cp -rf $BuildDir/usr/local/etc/omc/database/${v}/common/* $BuildDir/usr/local/etc/omc/database/${v}/install/
-  cp -rf $BuildDir/usr/local/etc/omc/database/${v}/common/* $BuildDir/usr/local/etc/omc/database/${v}/upgrade/
-  rm -rf $BuildDir/usr/local/etc/omc/database/${v}/common
+  path=$BuildDir/usr/local/etc/omc/database/${v}
+  cp -rf $path/common/* $path/install/
+  cp -rf $path/common/* $path/upgrade/
+  rm -rf $path/common
 done
diff --git a/linux/usr/local/etc/omc/database/.gitkeep b/linux/usr/local/etc/omc/database/lite/common/.gitkeep
similarity index 100%
rename from linux/usr/local/etc/omc/database/.gitkeep
rename to linux/usr/local/etc/omc/database/lite/common/.gitkeep
diff --git a/linux/usr/local/etc/omc/database/lite/install/.gitkeep b/linux/usr/local/etc/omc/database/lite/install/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/linux/usr/local/etc/omc/database/lite/upgrade/.gitkeep b/linux/usr/local/etc/omc/database/lite/upgrade/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/linux/usr/local/etc/omc/database/standard/common/.gitkeep b/linux/usr/local/etc/omc/database/standard/common/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/linux/usr/local/etc/omc/database/standard/install/.gitkeep b/linux/usr/local/etc/omc/database/standard/install/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/linux/usr/local/etc/omc/database/standard/upgrade/.gitkeep b/linux/usr/local/etc/omc/database/standard/upgrade/.gitkeep
new file mode 100644
index 0000000..e69de29