1
0

fix: adjustment db directory

This commit is contained in:
2024-03-08 15:03:22 +08:00
parent ca061181e6
commit cab0925653

View File

@@ -87,43 +87,46 @@ case "$1" in
# make rpm
# clear build cache
rm -rf $(FrontBuildDir)/front/*
rm -rf $(RpmFEBuildDir)/front/*
rm -rf $(RpmBuildDir)/BUILD/usr/local/omc/etc/db/*
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)
# $(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 ${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
#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 ${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
mv -f $RpmsDir/$RpmArch/$RpmPkgName $ReleaseDir/"$1"s/$RelArch/$RpmPkgRename
cd $ReleaseDir/"$1"s/$RelArch
@@ -162,6 +165,9 @@ case "$1" in
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}