From b758a21bab79456e9066998b67a8eb6277f9b82d Mon Sep 17 00:00:00 2001
From: zhangsz <zhangsz@omc.com>
Date: Mon, 16 Jun 2025 16:52:38 +0800
Subject: [PATCH] fix: ...

---
 bin/build.sh                   | 6 +++---
 debbuild/22.04/DEBIAN/control  | 2 +-
 debbuild/22.04/DEBIAN/postinst | 2 +-
 debbuild/DEBIAN/postinst       | 2 +-
 rpmbuild/SPECS/omc.spec        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/build.sh b/bin/build.sh
index 6a3aec0..2ab3320 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -220,7 +220,7 @@ case "${pkgtype}" in
         chmod 755 ${BuildOMCBinDir}/*
         cp -rf ${BuildDir}/* ${RpmBuildDir}/BUILD/
         cp -rf ${CustomizedDir}/agt.d ${RpmBuildOMCDir}/static
-	    cp -rf ${CustomizedDir}/omc.d ${RpmBuildOMCDir}/static
+	    cp -rf ${CustomizedDir}/psap.d ${RpmBuildOMCDir}/static
         cd ${RpmBuildDir}
         rpmbuild -bb -D "_topdir ${RpmBuildDir}" ${RpmBuildDir}/SPECS/omc.spec        
     
@@ -279,7 +279,7 @@ case "${pkgtype}" in
         chmod 755 ${DebBuildDir}/DEBIAN/postrm
         cp -rf ${BuildDir}/*  ${DebBuildDir}/
         cp -rf ${CustomizedDir}/agt.d ${DebBuildOMCDir}/static
-	    cp -rf ${CustomizedDir}/omc.d ${DebBuildOMCDir}/static
+	    cp -rf ${CustomizedDir}/psap.d ${DebBuildOMCDir}/static
         #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/*
@@ -400,7 +400,7 @@ case "${pkgtype}" in
         chmod 755 ${DebBuildDir}/DEBIAN/postrm
         cp -rf ${BuildDir}/*  ${DebBuildDir}/
         cp -rf ${CustomizedDir}/agt.d ${DebBuildOMCDir}/static
-	    cp -rf ${CustomizedDir}/omc.d ${DebBuildOMCDir}/static
+	    cp -rf ${CustomizedDir}/psap.d ${DebBuildOMCDir}/static
         #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/*
diff --git a/debbuild/22.04/DEBIAN/control b/debbuild/22.04/DEBIAN/control
index e0176de..23fe174 100644
--- a/debbuild/22.04/DEBIAN/control
+++ b/debbuild/22.04/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: PSAP
-Version: 1.2506.1-YYYYMMDD
+Version: 1.2506.1-20250616
 Section: AGrandTech
 Prioritt: optional   
 Architecture: amd64  
diff --git a/debbuild/22.04/DEBIAN/postinst b/debbuild/22.04/DEBIAN/postinst
index 61a9cd3..26ded25 100755
--- a/debbuild/22.04/DEBIAN/postinst
+++ b/debbuild/22.04/DEBIAN/postinst
@@ -47,7 +47,7 @@ fi
 
 for LogoFile in ${LogoFileList}; do
     if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then
-        cp ${OMCStaticDir}/omc.d/logo/${LogoFile} ${OMCStaticDir}/logo;
+        cp ${OMCStaticDir}/psap.d/logo/${LogoFile} ${OMCStaticDir}/logo;
     fi                 
 done
 
diff --git a/debbuild/DEBIAN/postinst b/debbuild/DEBIAN/postinst
index f943fa8..2a9d682 100644
--- a/debbuild/DEBIAN/postinst
+++ b/debbuild/DEBIAN/postinst
@@ -47,7 +47,7 @@ fi
 
 for LogoFile in ${LogoFileList}; do
     if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then
-        cp ${OMCStaticDir}/omc.d/logo/${LogoFile} ${OMCStaticDir}/logo;
+        cp ${OMCStaticDir}/psap.d/logo/${LogoFile} ${OMCStaticDir}/logo;
     fi                 
 done
 
diff --git a/rpmbuild/SPECS/omc.spec b/rpmbuild/SPECS/omc.spec
index f386fde..ff32354 100644
--- a/rpmbuild/SPECS/omc.spec
+++ b/rpmbuild/SPECS/omc.spec
@@ -61,7 +61,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}/omc.d/logo/${LogoFile} ${OMCStaticDir}/logo;
+        cp ${OMCStaticDir}/psap.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