From 6211a88f2e33d3ee1b7653f566754f88c25d66ca Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Sat, 11 Jan 2025 10:17:20 +0800 Subject: [PATCH] =?UTF-8?q?del:=20=20=E7=A7=BB=E9=99=A4captrace/data2html/?= =?UTF-8?q?crontask=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 41 ++++++++--------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/build.sh b/build.sh index 4f29267..3e8294a 100755 --- a/build.sh +++ b/build.sh @@ -93,24 +93,13 @@ EmsFEDir=${GitLocalRoot}/fe.ems EmsFEVue3Dir=${GitLocalRoot}/fe.ems.vue3/dist LibDir=${EmsBEDir}/lib RESTAGENT=restagent -CRONTASK=crontask SshSvcBin=sshsvc -CapTraceBin=captrace -Data2htmlBin=data2html -NBI_ALARM=nbi_alarm -NBI_AGENT=nbi_agent -AAAA_AGENT=4a_agent RestagentDir=${EmsBEDir}/${RESTAGENT} -CrontaskDir=${EmsBEDir}/${CRONTASK} SshSvcDir=${EmsBEDir}/${SshSvcBin} -CapTraceDir=${EmsBEDir}/${CapTraceBin} -Data2htmlDir=${EmsBEDir}/${Data2htmlBin} DBSQLSrcDir=${EmsBEDir}/database MiscDir=${EmsBEDir}/misc FrontBuildDir=${BuildOMCDir}/htdocs FrontSrcDir=${EmsBEDir}/front -CrontaskSize=27788951 -RestagentSize=29525312 BinWriterDir=${HOME}/bin if [[ ${RpmArch} =~ "x86_64" ]];then @@ -123,7 +112,7 @@ case "${pkgtype}" in rpm) echo "Begin to make ${pkgtype} package ======>" ReleasePkgDir=${ReleaseDir}/rpms/${RelArch} - ProcList="restagent crontask sshsvc captrace data2html" + ProcList="restagent sshsvc" cd $EmsBEDir for procName in $ProcList;do cd $EmsBEDir/$procName @@ -139,24 +128,15 @@ case "${pkgtype}" in rm -rf ${RpmBuildDir}/BUILD/usr/local/omc/etc/db/* cp -rf ${RestagentDir}/${RESTAGENT} ${BuildOMCBinDir} - cp -rf ${CrontaskDir}/${CRONTASK} ${BuildOMCBinDir} cp -rf ${SshSvcDir}/${SshSvcBin} ${BuildOMCBinDir} - cp -rf ${CapTraceDir}/${CapTraceBin} ${BuildOMCBinDir} - cp -rf ${Data2htmlDir}/${Data2htmlBin} ${BuildOMCBinDir} - # ${BinWriterDir}/binWriter ${BuildOMCBinDir}/${RESTAGENT} ${RestagentSize} - # ${BinWriterDir}/binWriter ${BuildOMCBinDir}/${CRONTASK} ${CrontaskSize} - # cp -rf ${MiscDir}/ne-hosts ${BuildOMCBinDir} - # cp -rf ./nbi/${NBI_ALARM}/bin/${NBI_ALARM} ${BinDir2} - # cp -rf ./nbi/${NBI_AGENT}/bin/${NBI_AGENT} ${BinDir2} - # cp -rf ./${4A_AGENT}/bin/${4A_AGENT} ${BinDir2} + cp -rf ${MiscDir}/* ${BuildOMCBinDir} # rm -rf ${BinDir2}/ne-hosts cp -rf ${ConfigEtcDir}/* ${BuildOMCEtcDir} rm -rf ${BuildOMCEtcDir}/db/* cp -rf ${DBSQLSrcDir}/* ${BuildOMCEtcDir}/db/ cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/install - cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/upgrade - cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/upgvue3 + cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/upgrade #Get SQL from database, overwrite from git if [ "$dumpdb" = "yes" ]; then cd ${DumpToolDir} @@ -185,7 +165,7 @@ case "${pkgtype}" in deb) echo "Begin to make ${pkgtype} package ======>" ReleasePkgDir=${ReleaseDir}/debs/${RelArch} - ProcList="restagent crontask sshsvc captrace data2html" + ProcList="restagent sshsvc" cd $EmsBEDir for procName in $ProcList;do cd $EmsBEDir/$procName @@ -223,17 +203,14 @@ case "${pkgtype}" in rm -rf ${DebBuildOMCDir}/static/* cp -rf ${RestagentDir}/${RESTAGENT} ${BuildOMCBinDir} - cp -rf ${CrontaskDir}/${CRONTASK} ${BuildOMCBinDir} cp -rf ${SshSvcDir}/${SshSvcBin} ${BuildOMCBinDir} - cp -rf ${CapTraceDir}/${CapTraceBin} ${BuildOMCBinDir} - cp -rf ${Data2htmlDir}/${Data2htmlBin} ${BuildOMCBinDir} + cp -rf ${MiscDir}/* ${BuildOMCBinDir} cp -rf ${ConfigEtcDir}/* ${BuildOMCEtcDir} rm -rf ${BuildOMCEtcDir}/db/* cp -rf ${DBSQLSrcDir}/* ${BuildOMCEtcDir}/db/ cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/install cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/upgrade - cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/upgvue3 #Get SQL from database, overwrite from git if [ "${dumpdb}" = "yes" ]; then cd ${DumpToolDir} @@ -265,7 +242,7 @@ case "${pkgtype}" in badeb) echo "Begin to make ${pkgtype} package ======>" ReleasePkgDir=${ReleaseDir}/debs/${RelArch} - ProcList="restagent crontask sshsvc captrace data2html" + ProcList="restagent sshsvc" cd $EmsBEDir for procName in $ProcList;do cd $EmsBEDir/$procName @@ -297,17 +274,15 @@ case "${pkgtype}" in rm -rf ${DebBuildOMCDir}/static/* cp -rf ${RestagentDir}/${RESTAGENT} ${BuildOMCBinDir} - cp -rf ${CrontaskDir}/${CRONTASK} ${BuildOMCBinDir} cp -rf ${SshSvcDir}/${SshSvcBin} ${BuildOMCBinDir} - cp -rf ${CapTraceDir}/${CapTraceBin} ${BuildOMCBinDir} - cp -rf ${Data2htmlDir}/${Data2htmlBin} ${BuildOMCBinDir} + cp -rf ${MiscDir}/* ${BuildOMCBinDir} cp -rf ${ConfigEtcDir}/* ${BuildOMCEtcDir} rm -rf ${BuildOMCEtcDir}/db/* cp -rf ${DBSQLSrcDir}/* ${BuildOMCEtcDir}/db/ cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/install cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/upgrade - cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/upgvue3 + #Get SQL from database, overwrite from git if [ "${dumpdb}" = "yes" ]; then cd ${DumpToolDir}