From 3e08ef0cc48d3ff79585b300b8baf15af1a8cfdf Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Thu, 7 Nov 2024 14:37:00 +0800
Subject: [PATCH] update build package shell script

---
 build.sh   | 10 ++++++++--
 makepkg.sh |  8 ++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index 7c23ce1..d794e5e 100755
--- a/build.sh
+++ b/build.sh
@@ -121,6 +121,7 @@ fi
 
 case "${pkgtype}" in
     rpm)
+        echo "Begin to make ${pkgtype} package ======>"
         ReleasePkgDir=${ReleaseDir}/rpms/${RelArch}
         ProcList="restagent crontask sshsvc captrace data2html"
         cd $EmsBEDir
@@ -179,8 +180,10 @@ case "${pkgtype}" in
         rm -f omc-md5sum.txt
 #        rpm --addsign *.rpm
         md5sum $RpmPkgRename >omc-md5sum.txt
+        echo "Finish to make ${pkgtype} package <======"        
     ;;
     deb)
+        echo "Begin to make ${pkgtype} package ======>"
         ReleasePkgDir=${ReleaseDir}/debs/${RelArch}
         ProcList="restagent crontask sshsvc captrace data2html"
         cd $EmsBEDir
@@ -256,9 +259,11 @@ case "${pkgtype}" in
         cd ${ReleasePkgDir}
         rm -f omc-md5sum.txt
 #        rpm --addsign *.rpm
-        md5sum ${DebPkgName} >omc-md5sum.txt        
+        md5sum ${DebPkgName} >omc-md5sum.txt
+        echo "Finish to make ${pkgtype} package <======="        
     ;;
     badeb)
+        echo "Begin to make ${pkgtype} package ======>"
         ReleasePkgDir=${ReleaseDir}/debs/${RelArch}
         ProcList="restagent crontask sshsvc captrace data2html"
         cd $EmsBEDir
@@ -327,7 +332,8 @@ case "${pkgtype}" in
 
         cd ${ReleasePkgDir}
         rm -f omc-md5sum.txt
-        md5sum ${DebPkgName} >omc-md5sum.txt        
+        md5sum ${DebPkgName} >omc-md5sum.txt
+        echo "Finish to make ${pkgtype} package <======"        
     ;;    
     *)
         usage
diff --git a/makepkg.sh b/makepkg.sh
index 369a5b0..0efb5cd 100755
--- a/makepkg.sh
+++ b/makepkg.sh
@@ -75,17 +75,20 @@ buildcustomized=${builddir}/customized
 customizeddir=${buildcustomized}/${c_arg}.d
 
 fedir=${rootdir}/fe.ems.vue3
-feassetsdir=${fedir}/assets
-felocalesdir=${fedir}/i18n/locales
+feassetsdir=${fedir}/src/assets
+felocalesdir=${fedir}/src/i18n/locales
+feconstantsdir=${fedir}/src/constants
 
 makefe() {
     cd ${fedir}
     git checkout ${feassetsdir}
     git checkout ${felocalesdir}
+    git checkout ${feconstantsdir}
     git pull
     if [ "${c_arg}" == "ba" ]; then
         cp -rf ${customizeddir}/images/* ${feassetsdir}
         cp -rf ${customizeddir}/locales/* ${felocalesdir}
+        find "${feconstantsdir}" -type f -name '*.ts' -exec sed -i 's/[一-龥]//g' {} +
     fi     
     npm install --force --registry https://registry.npmmirror.com
     echo -n "Building front-end vue ... "
@@ -95,6 +98,7 @@ makefe() {
     fi
     git checkout ${feassetsdir}
     git checkout ${felocalesdir}    
+    git checkout ${feconstantsdir}
 }
 
 makebe() {