diff --git a/linux/usr/local/etc/omc/script/setup.sh b/linux/usr/local/etc/omc/script/setup.sh index 5d210bf..803abc7 100644 --- a/linux/usr/local/etc/omc/script/setup.sh +++ b/linux/usr/local/etc/omc/script/setup.sh @@ -95,7 +95,7 @@ fi # ========================= if [[ "$T_PARAM" == "install" && "$MODE" == "standard" ]]; then - if ! command -v mysql &> /dev/null && ! command -v mariadb &> /dev/null; then + if ! command -v mysql &> /dev/null || ! command -v mariadb &> /dev/null; then echo "MySQL or MariaDB not installed" exit 1 fi diff --git a/pkg.sh b/pkg.sh index 306b894..8af5afc 100644 --- a/pkg.sh +++ b/pkg.sh @@ -75,6 +75,14 @@ if [ -n "$BuildApi" ]; then make cp -rf sshsvc $output/sshsvc echo "===> go build sshsvc copy to $output" + + # Vendor Database + dirs="database default vendor" + for v in ${dirs}; do + path=$BuildDir/tmp/usr/local/etc/omc + rm -rf ${path}/${v} + cp -rf ${ApiDir}/build/${v} ${path}/${v} + done fi # =================== deb/rpm