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) # 更新操作