diff --git a/build.sh b/build.sh index 4f1cf67..8b169ff 100755 --- a/build.sh +++ b/build.sh @@ -192,6 +192,7 @@ case "${pkgtype}" in VersionID=`grep VERSION_ID /etc/os-release` if [[ ${VersionID} =~ 'VERSION_ID="22.04"' ]]; then DebBuildDir=${DebBuild2204Dir} + DebBuildOMCDir=${DebBuild2204OMCDir} DebFEBuildDir=${DebFEBuild2204Dir} #DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub22.deb @@ -262,7 +263,7 @@ case "${pkgtype}" in VersionID=`grep VERSION_ID /etc/os-release` if [[ ${VersionID} =~ 'VERSION_ID="22.04"' ]]; then DebBuildDir=${DebBuild2204Dir} - DebFEBuildDir=${DebFEBuild2204Dir} + DebBuildOMCDir=${DebBuild2204OMCDir} DebFEBuildDir=${DebFEBuild2204Dir} #DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub22-ba.deb diff --git a/makepkg.sh b/makepkg.sh index c15789d..b0b73d0 100755 --- a/makepkg.sh +++ b/makepkg.sh @@ -1,11 +1,10 @@ #!/bin/bash usage() { - echo "Usage: $0 deb|badeb|rpm [option]..." + echo "Usage: $0 deb|rpm [option]..." echo echo "Make omc package, option as follow:" - echo " deb|badeb|rpm, deb: ubuntu|debian package build by dpkg" - echo " badeb: BA ubuntu|debian package build by dpkg" + echo " deb|rpm, deb: ubuntu|debian package build by dpkg" echo " rpm: centos/redhat package, build by rpmbuild" echo " -r, =build root directory build root directory, default directory is $HOME/omc.git" echo " -d dump SQL from database"