diff --git a/build.sh b/build.sh index fce0115..1cd078b 100644 --- a/build.sh +++ b/build.sh @@ -234,7 +234,7 @@ case "${pkgtype}" in #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 + perl -0777 -i -pe 's/ne:\n user: root/ne:\n user: omcuser/g' ${DebBuildDir}/usr/local/omc/etc/default/restconf.yaml dpkg -b ${DebBuildDir} ${ReleasePkgDir}/${DebPkgFile} cd ${ReleasePkgDir} diff --git a/build/usr/local/omc/static/agt.d/db/customized.sql b/build/usr/local/omc/static/omc.d/db/customized.sql similarity index 100% rename from build/usr/local/omc/static/agt.d/db/customized.sql rename to build/usr/local/omc/static/omc.d/db/customized.sql diff --git a/build/usr/local/omc/static/agt.d/doc/en_doc.pdf b/build/usr/local/omc/static/omc.d/doc/en_doc.pdf similarity index 100% rename from build/usr/local/omc/static/agt.d/doc/en_doc.pdf rename to build/usr/local/omc/static/omc.d/doc/en_doc.pdf diff --git a/build/usr/local/omc/static/agt.d/doc/zh_doc.pdf b/build/usr/local/omc/static/omc.d/doc/zh_doc.pdf similarity index 100% rename from build/usr/local/omc/static/agt.d/doc/zh_doc.pdf rename to build/usr/local/omc/static/omc.d/doc/zh_doc.pdf diff --git a/build/usr/local/omc/static/agt.d/logo/en_brand.png b/build/usr/local/omc/static/omc.d/logo/en_brand.png similarity index 100% rename from build/usr/local/omc/static/agt.d/logo/en_brand.png rename to build/usr/local/omc/static/omc.d/logo/en_brand.png diff --git a/build/usr/local/omc/static/agt.d/logo/en_icon.png b/build/usr/local/omc/static/omc.d/logo/en_icon.png similarity index 100% rename from build/usr/local/omc/static/agt.d/logo/en_icon.png rename to build/usr/local/omc/static/omc.d/logo/en_icon.png diff --git a/build/usr/local/omc/static/agt.d/logo/zh_brand.png b/build/usr/local/omc/static/omc.d/logo/zh_brand.png similarity index 100% rename from build/usr/local/omc/static/agt.d/logo/zh_brand.png rename to build/usr/local/omc/static/omc.d/logo/zh_brand.png diff --git a/build/usr/local/omc/static/agt.d/logo/zh_icon.png b/build/usr/local/omc/static/omc.d/logo/zh_icon.png similarity index 100% rename from build/usr/local/omc/static/agt.d/logo/zh_icon.png rename to build/usr/local/omc/static/omc.d/logo/zh_icon.png diff --git a/debbuild/22.04/DEBIAN/postinst b/debbuild/22.04/DEBIAN/postinst index 126fe7d..4451ce4 100644 --- a/debbuild/22.04/DEBIAN/postinst +++ b/debbuild/22.04/DEBIAN/postinst @@ -57,7 +57,7 @@ fi for LogoFile in ${LogoFileList}; do if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then - cp ${OMCStaticDir}/agt.d/logo/${LogoFile} ${OMCStaticDir}/logo; + cp ${OMCStaticDir}/omc.d/logo/${LogoFile} ${OMCStaticDir}/logo; fi done diff --git a/debbuild/DEBIAN/postinst b/debbuild/DEBIAN/postinst index 2b5e982..4bf4a09 100644 --- a/debbuild/DEBIAN/postinst +++ b/debbuild/DEBIAN/postinst @@ -57,7 +57,7 @@ fi for LogoFile in ${LogoFileList}; do if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then - cp ${OMCStaticDir}/agt.d/logo/${LogoFile} ${OMCStaticDir}/logo; + cp ${OMCStaticDir}/omc.d/logo/${LogoFile} ${OMCStaticDir}/logo; fi done diff --git a/rpmbuild/SPECS/omc.spec b/rpmbuild/SPECS/omc.spec index e5571d8..8359b83 100644 --- a/rpmbuild/SPECS/omc.spec +++ b/rpmbuild/SPECS/omc.spec @@ -85,7 +85,7 @@ done if [ ! -e "${FERootDir}/config.js" ]; then cp ${FERootDir}/default/config.js ${FERootDir}; fi for LogoFile in ${LogoFileList}; do if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then - cp ${OMCStaticDir}/agt.d/logo/${LogoFile} ${OMCStaticDir}/logo; + cp ${OMCStaticDir}/omc.d/logo/${LogoFile} ${OMCStaticDir}/logo; fi done if ! id -u omc >/dev/null 2>&1 ; then useradd -d /opt/omc -m -s /bin/bash -p1000ftp@kp omc; else echo "user omc exist"; fi