diff --git a/build.sh b/build.sh index 758b91c..d830909 100755 --- a/build.sh +++ b/build.sh @@ -69,6 +69,7 @@ RpmArch=`arch` RpmsDir=${EmsBuildRoot}/rpmbuild/RPMS/ ReleaseDir=${EmsBuildRoot}/release DumpToolDir=${EmsBEDir}/tools/misc +ProjectTag="" BuildDir=${EmsBuildRoot}/build CustomizedDir=${EmsBuildRoot}/customized @@ -195,9 +196,15 @@ case "${pkgtype}" in DebBuildOMCDir=${DebBuild2204OMCDir} DebFEBuildDir=${DebFEBuild2204Dir} #DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb - DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub22.deb + DebPkgFile=${PROJECT}-r${RelVer}-ub22.deb + if [ ! $ProjectTag = "" ]; then + DebPkgFile=${ProjectL}-r${RelVer}-ub22-${ProjectTag}.deb + fi elif [[ ${VersionID} =~ 'VERSION_ID="18.04"' ]]; then - DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub18.deb + DebPkgFile=${ProjectL}-r${RelVer}-ub18.deb + if [ ! $ProjectTag = "" ]; then + DebPkgFile=${ProjectL}-r${RelVer}-ub18-${ProjectTag}.deb + fi else echo "Invalid OS release: ${VersionID}" exit 1 @@ -267,9 +274,9 @@ case "${pkgtype}" in DebBuildOMCDir=${DebBuild2204OMCDir} DebFEBuildDir=${DebFEBuild2204Dir} #DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb - DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub22-ba.deb + DebPkgFile=${ProjectL}-r${RelVer}-ub22-ba.deb elif [[ ${VersionID} =~ 'VERSION_ID="18.04"' ]]; then - DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub18-ba.deb + DebPkgFile=${ProjectL}-r${RelVer}-ub18-ba.deb else echo "Invalid OS release: ${VersionID}" exit 1 diff --git a/customized/ba.d/logo/zh_brand.png b/customized/ba.d/logo/zh_brand.png deleted file mode 100644 index 5d04ab3..0000000 Binary files a/customized/ba.d/logo/zh_brand.png and /dev/null differ diff --git a/customized/ba.d/logo/zh_icon.png b/customized/ba.d/logo/zh_icon.png deleted file mode 100644 index 8ba330e..0000000 Binary files a/customized/ba.d/logo/zh_icon.png and /dev/null differ