From 93e3e633d3162a77828b3983658b7022c344671e Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 31 May 2024 11:20:56 +0800 Subject: [PATCH] fix... --- build.sh | 153 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 77 insertions(+), 76 deletions(-) diff --git a/build.sh b/build.sh index b963696..6178c7e 100644 --- a/build.sh +++ b/build.sh @@ -8,19 +8,20 @@ while getopts "m:r:d" option; do r) r_arg=$OPTARG ;; - d) - dumpflag="yes" - ;; + d) + dumpflag="yes" + ;; \?) echo "Invalid option: -$OPTARG" >&2 ;; esac done -GitLocalRoot=$HOME/local.git +GitLocalRoot=${HOME}/local.git if [ -n ${r_arg} ]; then - GitLocalRoot=${r_arg} + GitLocalRoot=${r_arg} fi +echo "GitLocalRoot=${GitLocalRoot}" ProjectL=omc ProjectU=OMC @@ -97,9 +98,9 @@ done #Get SQL from database if [ ${dumpflag} = "yes" ]; then - cd ${DumpToolDir} - chmod +x ${DumpToolDir}/dumpdb.sh - ${DumpToolDir}/dumpdb.sh + cd ${DumpToolDir} + chmod +x ${DumpToolDir}/dumpdb.sh + ${DumpToolDir}/dumpdb.sh fi case "$1" in @@ -107,47 +108,47 @@ case "$1" in cd $EmsBEDir # make rpm - # clear build cache - rm -rf ${FrontBuildDir}/front/* - rm -rf ${RpmFEBuildDir}/front/* - rm -rf ${RpmBuildDir}/BUILD/usr/local/omc/etc/db/* + # clear build cache + rm -rf ${FrontBuildDir}/front/* + rm -rf ${RpmFEBuildDir}/front/* + 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} + 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} + 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 ${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, recover from git - if [ "$2" = "db" ]; then - cd ${DumpToolDir} - chmod +x ${DumpToolDir}/dumpsql.sh - ${DumpToolDir}/dumpsql.sh - fi - cp -rf ${ConfigSystemdDir}/* ${BuildLibSystemDir} - #unzip ${FrontSrcDir}/front.zip -d ${FrontBuildDir} >/dev/null - mkdir -p ${FrontBuildDir}/front - cp -rf ${EmsFEVue3Dir}/* ${FrontBuildDir}/front >/dev/null - chmod 755 ${BuildOMCBinDir}/* + #Get SQL from database, recover from git + if [ "$2" = "db" ]; then + cd ${DumpToolDir} + chmod +x ${DumpToolDir}/dumpsql.sh + ${DumpToolDir}/dumpsql.sh + fi + cp -rf ${ConfigSystemdDir}/* ${BuildLibSystemDir} + #unzip ${FrontSrcDir}/front.zip -d ${FrontBuildDir} >/dev/null + mkdir -p ${FrontBuildDir}/front + cp -rf ${EmsFEVue3Dir}/* ${FrontBuildDir}/front >/dev/null + chmod 755 ${BuildOMCBinDir}/* # chmod 755 ${BinDir2}/* - cp -rf ${BuildDir}/* ${RpmBuildDir}/BUILD/ - #cp -rf ${BuildDir}/nginx ${RpmBuildDir}/BUILD/etc/ - #cp -rf ${BuildDir}/systemd ${RpmBuildDir}/BUILD/lib/ - cd ${RpmBuildDir} - rpmbuild -bb -D "_topdir ${RpmBuildDir}" ${RpmBuildDir}/SPECS/omc.spec + cp -rf ${BuildDir}/* ${RpmBuildDir}/BUILD/ + #cp -rf ${BuildDir}/nginx ${RpmBuildDir}/BUILD/etc/ + #cp -rf ${BuildDir}/systemd ${RpmBuildDir}/BUILD/lib/ + cd ${RpmBuildDir} + rpmbuild -bb -D "_topdir ${RpmBuildDir}" ${RpmBuildDir}/SPECS/omc.spec mv -f $RpmsDir/$RpmArch/$RpmPkgName $ReleaseDir/"$1"s/$RelArch/$RpmPkgRename cd $ReleaseDir/"$1"s/$RelArch @@ -172,42 +173,42 @@ case "$1" in cd ${EmsBEDir} #make deb - # clear build cache - rm -rf ${FrontBuildDir}/front/* - rm -rf ${DebFEBuildDir}/front/* - rm -rf ${DebBuildDir}/usr/local/omc/etc/db/* + # clear build cache + rm -rf ${FrontBuildDir}/front/* + rm -rf ${DebFEBuildDir}/front/* + rm -rf ${DebBuildDir}/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} - 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 ${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, recover from git - if [ "$2" = "db" ]; then - cd ${DumpToolDir} - chmod +x ${DumpToolDir}/dumpsql.sh - ${DumpToolDir}/dumpsql.sh - fi - cp -rf ${ConfigSystemdDir}/* ${BuildLibSystemDir} - cp -rf ${EmsFEVue3Dir}/* ${FrontBuildDir}/front >/dev/null - chmod 755 ${BuildOMCBinDir}/* - chmod 755 ${DebBuildDir}/DEBIAN/preinst - chmod 755 ${DebBuildDir}/DEBIAN/postinst - chmod 755 ${DebBuildDir}/DEBIAN/postrm - cp -rf ${BuildDir}/* ${DebBuildDir}/ - #cp -rf ${BuildDir}/nginx/* ${DebBuildDir}/etc/nginx/conf.d - #cp -rf ${BuildDir}/systemd/*.service ${DebBuildDir}/lib/systemd/system/ - chmod +x ${DebBuildDir}/usr/local/omc/bin/* - sed -i "s/YYYYMMDD/${RelDate}/g" ${DebBuildDir}/DEBIAN/control - perl -0777 -i -pe 's/ne:\n user: root/ne:\n user: agtuser/g' ${DebBuildDir}/usr/local/omc/etc/default/restconf.yaml - dpkg -b ${DebBuildDir} ${ReleaseDebs}/${DebPkgFile} + #Get SQL from database, recover from git + if [ "$2" = "db" ]; then + cd ${DumpToolDir} + chmod +x ${DumpToolDir}/dumpsql.sh + ${DumpToolDir}/dumpsql.sh + fi + cp -rf ${ConfigSystemdDir}/* ${BuildLibSystemDir} + cp -rf ${EmsFEVue3Dir}/* ${FrontBuildDir}/front >/dev/null + chmod 755 ${BuildOMCBinDir}/* + chmod 755 ${DebBuildDir}/DEBIAN/preinst + chmod 755 ${DebBuildDir}/DEBIAN/postinst + chmod 755 ${DebBuildDir}/DEBIAN/postrm + cp -rf ${BuildDir}/* ${DebBuildDir}/ + #cp -rf ${BuildDir}/nginx/* ${DebBuildDir}/etc/nginx/conf.d + #cp -rf ${BuildDir}/systemd/*.service ${DebBuildDir}/lib/systemd/system/ + chmod +x ${DebBuildDir}/usr/local/omc/bin/* + sed -i "s/YYYYMMDD/${RelDate}/g" ${DebBuildDir}/DEBIAN/control + perl -0777 -i -pe 's/ne:\n user: root/ne:\n user: agtuser/g' ${DebBuildDir}/usr/local/omc/etc/default/restconf.yaml + dpkg -b ${DebBuildDir} ${ReleaseDebs}/${DebPkgFile} cd $ReleaseDir/"$1"s/$RelArch rm -f omc-md5sum.txt @@ -216,10 +217,10 @@ case "$1" in ;; *) echo "Usage: $0 rpm|deb -r root directory -d" - echo "\n" - echo "Build omc package" - echo "rpm|deb, rpm rpm package / ubuntu|debian package" - echo "-r, =root directory build root directory, default directory is $HOME/local.git" - echo "-d dump SQL from database" + echo + echo "Build omc package" + echo "rpm|deb, rpm rpm package / ubuntu|debian package" + echo "-r, =root directory build root directory, default directory is $HOME/local.git" + echo "-d dump SQL from database" ;; esac