diff --git a/build.sh b/build.sh index fddec7c..c317030 100644 --- a/build.sh +++ b/build.sh @@ -67,10 +67,10 @@ case "${pkgtype}" in echo '/*use nginx*/' | tee ${RpmBuildDirOMCFront}/config.js # 打包可执行文件 - cd $EmsBEDir/omc + cd $EmsBEDir/restagent echo "Make omc ..." make - cp -rf ${EmsBEDir}/omc/omc ${RpmBuildDirOMCBin}/omc + cp -rf ${EmsBEDir}/restagent/omc ${RpmBuildDirOMCBin}/omc chmod +x ${RpmBuildDirOMCBin}/* # 打包rpm @@ -103,10 +103,10 @@ case "${pkgtype}" in echo '/*use nginx*/' | tee ${DebBuildDirOMCFront}/config.js # 打包可执行文件 - cd $EmsBEDir/omc + cd $EmsBEDir/restagent echo "Make omc ..." make - cp -rf ${EmsBEDir}/omc/omc ${DebBuildDirOMCBin}/omc + cp -rf ${EmsBEDir}/restagent/omc ${DebBuildDirOMCBin}/omc chmod +x ${DebBuildDirOMCBin}/* # 打包deb diff --git a/build/rpmbuild/SPECS/omc.spec b/build/rpmbuild/SPECS/omc.spec index 8d9df4c..21b3538 100644 --- a/build/rpmbuild/SPECS/omc.spec +++ b/build/rpmbuild/SPECS/omc.spec @@ -88,7 +88,5 @@ fi /usr/local/omc/.ssh /usr/local/omc/bin /usr/local/omc/etc -/usr/local/omc/htdocs -# %exclude /usr/local/omc/htdocs/front/wiregasm/wiregasm.wasm.gz /usr/local/omc/static /lib/systemd/system/omc.service diff --git a/go.mod b/go.mod index f398c8b..76f6be1 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module be.ems go 1.22 -toolchain go1.23.1 - require ( github.com/IBM/sarama v1.43.3 github.com/dlclark/regexp2 v1.11.4