om出包version从1.0.1改成1.1.0

This commit is contained in:
hangjin2020 2020-12-25 17:28:20 +08:00
parent e2d3ac3642
commit 71706676b1
2 changed files with 14 additions and 14 deletions

View File

@ -2,7 +2,7 @@
declare binarylib_dir='None'
declare module_name="openGauss"
declare version_number='1.0.1'
declare version_number='1.1.0'
ROOT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
echo "ROOT_DIR : $ROOT_DIR"
declare ERR_MKGS_FAILED=1
@ -135,7 +135,7 @@ function version_cfg()
gitversion=$(git log | grep commit | head -1 | awk '{print $2}' | cut -b 1-8)
commits=$(git log | grep "See in merge request" | wc -l)
mrid=$(git log | grep "See in merge request" | head -1 | awk -F! '{print $2}' | grep -o '[0-9]\+')
om_version="(openGauss OM 1.0.1 build $gitversion) compiled at `date -d today +\"%Y-%m-%d %H:%M:%S\"` commit $commits last mr $mrid"
om_version="(openGauss OM 1.1.0 build $gitversion) compiled at `date -d today +\"%Y-%m-%d %H:%M:%S\"` commit $commits last mr $mrid"
version_file=${PKG_TMP_DIR}/version.cfg
touch ${version_file}
echo "${module_name}-${version_number}">${version_file}

View File

@ -100,29 +100,29 @@ function fn_get_openGauss_tar()
fi
cd "$install_tar"
if [ "`find $cur_path/../ -maxdepth 1 -name "openGauss-1.0.1-*"|wc -l`" -lt "3" ]
if [ "`find $cur_path/../ -maxdepth 1 -name "openGauss-1.1.0-*"|wc -l`" -lt "3" ]
then
if [ "`find . -name "openGauss-1.0.1-*"|wc -l`" -lt "3" ]
if [ "`find . -name "openGauss-1.1.0-*"|wc -l`" -lt "3" ]
then
url="https://opengauss.obs.cn-south-1.myhuaweicloud.com/1.0.1/${system_arch}/openGauss_1.0.1_PACKAGES_RELEASE.tar.gz"
url="https://opengauss.obs.cn-south-1.myhuaweicloud.com/1.1.0/${system_arch}/openGauss-1.1.0-${system_name}-64bit-all.tar.gz"
echo "Downloading openGauss tar from official website at ${install_tar}"
wget $url --timeout=30 --tries=3 && tar -zxvf openGauss_1.0.1_PACKAGES_RELEASE.tar.gz
wget $url --timeout=30 --tries=3 && tar -zxvf openGauss-1.1.0-${system_name}-64bit-all.tar.gz
if [ $? -ne 0 ]
then
echo "wget error. The $install_tar need openGauss-1.0.1-${system_name}-64bit-om.tar.gz"
echo "wget error. The $install_tar need openGauss-1.0.1-${system_name}-64bit.sha256"
echo "wget error. The $install_tar need openGauss-1.0.1-${system_name}-64bit.tar.bz2"
echo "wget error. The $install_tar need openGauss-1.1.0-${system_name}-64bit-om.tar.gz"
echo "wget error. The $install_tar need openGauss-1.1.0-${system_name}-64bit.sha256"
echo "wget error. The $install_tar need openGauss-1.1.0-${system_name}-64bit.tar.bz2"
return 1
else
echo "wget success."
fi
fi
else
if [ "`find . -name "openGauss-1.0.1-*"|wc -l`" -lt "3" ]
if [ "`find . -name "openGauss-1.1.0-*"|wc -l`" -lt "3" ]
then
cp "$cur_path/../openGauss-1.0.1-${system_name}-64bit-om.tar.gz" \
"$cur_path/../openGauss-1.0.1-${system_name}-64bit.tar.bz2" \
"$cur_path/../openGauss-1.0.1-${system_name}-64bit.sha256" "$install_tar"
cp "$cur_path/../openGauss-1.1.0-${system_name}-64bit-om.tar.gz" \
"$cur_path/../openGauss-1.1.0-${system_name}-64bit.tar.bz2" \
"$cur_path/../openGauss-1.1.0-${system_name}-64bit.sha256" "$install_tar"
if [ $? -ne 0 ]
then
echo "copy Installation package error."
@ -269,7 +269,7 @@ function fn_tar()
echo "Get openGauss Installation package success."
fi
cd "${install_tar}"
tar -zxf "openGauss-1.0.1-${system_name}-64bit-om.tar.gz"
tar -zxf "openGauss-1.1.0-${system_name}-64bit-om.tar.gz"
if [ $? -ne 0 ]
then
echo "tar package error."