From 71706676b1a26f6642eef85908eaccb69b999240 Mon Sep 17 00:00:00 2001
From: hangjin2020 <850894759@qq.com>
Date: Fri, 25 Dec 2020 17:28:20 +0800
Subject: [PATCH] =?UTF-8?q?om=E5=87=BA=E5=8C=85version=E4=BB=8E1.0.1?=
 =?UTF-8?q?=E6=94=B9=E6=88=901.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.sh                 |  4 ++--
 simpleInstall/install.sh | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/build.sh b/build.sh
index 51e812d..f8a11db 100644
--- a/build.sh
+++ b/build.sh
@@ -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}
diff --git a/simpleInstall/install.sh b/simpleInstall/install.sh
index 8d4fa9f..ebc393f 100644
--- a/simpleInstall/install.sh
+++ b/simpleInstall/install.sh
@@ -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."