From 9a954da5acb9ca2ecfea1971c79cba016efcc606 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Wed, 6 Dec 2023 16:13:21 +0800 Subject: [PATCH] fix:make package shell --- mkpkg.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mkpkg.sh b/mkpkg.sh index 879a50ff..93706935 100644 --- a/mkpkg.sh +++ b/mkpkg.sh @@ -4,21 +4,21 @@ ProcList="restagent crontask sshsvc captrace data2html" ProjectL=omc VERSION=2.2312.8 RelDate=`date +%Y%m%d` -Release=$RelDate -RelVer=$VERSION-$RelDate +Release=${RelDate} +RelVer=${VERSION}-${RelDate} Ky10Arch=ky10.aarch64 -RpmPkgName=$ProjectL-$RelVer.ky10.aarch64.rpm -RpmPkgRename=$ProjectL-r$RelVer_ky10.rpm -DebPkgName=$ProjectL-r$RelVer_u*.deb -GitLocalRoot=$HOME/local.git -EmsBEDir=$GitLocalRoot/ems.agt -EmsBuildRoot=$GitLocalRoot/build.ems +RpmPkgName=${ProjectL}-${RelVer}.ky10.aarch64.rpm +RpmPkgRename=${ProjectL}-r${RelVer}_ky10.rpm +DebPkgName=${ProjectL}-r${RelVer}_u*.deb +GitLocalRoot=${HOME}/local.git +EmsBEDir=${GitLocalRoot}/ems.agt +EmsBuildRoot=${GitLocalRoot}/build.ems RpmArch=`arch` -RpmsDir=$EmsBuildRoot/rpmbuild/RPMS/ -ReleaseDir=$EmsBuildRoot/release +RpmsDir=${EmsBuildRoot}/rpmbuild/RPMS/ +ReleaseDir=${EmsBuildRoot}/release DumpToolDir=${EmsBEDir}/tools/misc -if [[ $RpmArch =~ "x86_64" ]];then +if [[ ${RpmArch} =~ "x86_64" ]];then RelArch=amd64 elif [[ $RpmArch =~ "aarch64" ]];then RelArch=arm64