From 39204e55c086b318b0cb74c44f1ab0c9d53fa21a Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Thu, 14 Nov 2024 19:45:18 +0800 Subject: [PATCH] fix: update yaml config file issue --- .gitignore | 7 ++++--- debbuild/22.04/DEBIAN/postinst | 2 +- debbuild/DEBIAN/postinst | 2 +- rpmbuild/SPECS/omc.spec | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3a9f6a6..01bd363 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ build/ release/* # --> debbuild debbuild/* -!debbuild/22.04/DEBIAN/postinst -!debbuild/DEBIAN/* - +!debbuild/22.04 +!debbuild/22.04/DEBIAN/* +!debbuild/DEBIAN/ +!debbuild/DEBIAN/* \ No newline at end of file diff --git a/debbuild/22.04/DEBIAN/postinst b/debbuild/22.04/DEBIAN/postinst index c7de062..baa8353 100755 --- a/debbuild/22.04/DEBIAN/postinst +++ b/debbuild/22.04/DEBIAN/postinst @@ -48,7 +48,7 @@ for CFile in ${CFileList}; do else # mv -f ${OMCEtcDir}/${CFile} ${OMCEtcDir}/${CFile}.bak # cp -f ${OMCEtcDir}/default/${CFile} ${OMCEtcDir} - if [ -e "${OMCBinDir}/upgconf.sh" ]; then + if [ [ -e "${OMCBinDir}/upgconf.sh" ] && [ "${CFile}" == "restconf.yaml" ] ]; then ${OMCBinDir}/upgconf.sh fi fi diff --git a/debbuild/DEBIAN/postinst b/debbuild/DEBIAN/postinst index 56f4f4a..6e15337 100644 --- a/debbuild/DEBIAN/postinst +++ b/debbuild/DEBIAN/postinst @@ -48,7 +48,7 @@ for CFile in ${CFileList}; do else # mv -f ${OMCEtcDir}/${CFile} ${OMCEtcDir}/${CFile}.bak # cp -f ${OMCEtcDir}/default/${CFile} ${OMCEtcDir} - if [ -e "${OMCBinDir}/upgconf.sh" ]; then + if [ [ -e "${OMCBinDir}/upgconf.sh" ] && [ "${CFile}" == "restconf.yaml" ] ]; then ${OMCBinDir}/upgconf.sh fi fi diff --git a/rpmbuild/SPECS/omc.spec b/rpmbuild/SPECS/omc.spec index 79c7453..2eed133 100644 --- a/rpmbuild/SPECS/omc.spec +++ b/rpmbuild/SPECS/omc.spec @@ -55,7 +55,7 @@ for CFile in ${CFileList}; do else # mv -f ${OMCEtcDir}/${CFile} ${OMCEtcDir}/${CFile}.bak # cp -f ${OMCEtcDir}/default/${CFile} ${OMCEtcDir} - if [ -e "${OMCBinDir}/upgconf.sh" ]; then + if [ [ -e "${OMCBinDir}/upgconf.sh" ] && [ "${CFile}" == "restconf.yaml" ] ]; then ${OMCBinDir}/upgconf.sh fi fi