[fix] Update backup_setup.sh

backup_setup.sh

@@ -184,7 +184,7 @@ fi
 
 if [ -n "`echo ${desc_bk} | grep -w 3`" ]; then
   if [ ! -e "/usr/local/bin/ossutil" ]; then
-    wget -qc http://gosspublic.alicdn.com/ossutil/1.6.7/ossutil${OS_BIT} -O /usr/local/bin/ossutil
+    wget -qc http://gosspublic.alicdn.com/ossutil/1.6.9/ossutil${OS_BIT} -O /usr/local/bin/ossutil
     chmod +x /usr/local/bin/ossutil
   fi
   while :; do echo
@@ -192,18 +192,19 @@ if [ -n "`echo ${desc_bk} | grep -w 3`" ]; then
     echo -e "\t ${CMSG}1${CEND}. cn-hangzhou-华东 1 (杭州)         ${CMSG}2${CEND}. cn-shanghai-华东 2 (上海)"
     echo -e "\t ${CMSG}3${CEND}. cn-qingdao-华北 1 (青岛)          ${CMSG}4${CEND}. cn-beijing-华北 2 (北京)"
     echo -e "\t ${CMSG}5${CEND}. cn-zhangjiakou-华北 3 (张家口)    ${CMSG}6${CEND}. cn-huhehaote-华北 5(呼和浩特)"
-    echo -e "\t ${CMSG}7${CEND}. cn-shenzhen-华南 1 (深圳)         ${CMSG}8${CEND}. cn-hongkong-香港"
-    echo -e "\t ${CMSG}9${CEND}. us-west-美西 1 (硅谷)            ${CMSG}10${CEND}. us-east-美东 1 (弗吉尼亚)"
-    echo -e "\t${CMSG}11${CEND}. ap-southeast-亚太东南 1 (新加坡) ${CMSG}12${CEND}. ap-southeast-亚太东南 2 (悉尼)"
-    echo -e "\t${CMSG}13${CEND}. ap-southeast-亚太东南 3 (吉隆坡) ${CMSG}14${CEND}. ap-southeast-亚太东南 5 (雅加达)"
-    echo -e "\t${CMSG}15${CEND}. ap-northeast-亚太东北 1 (日本)   ${CMSG}16${CEND}. ap-south-亚太南部 1 (孟买)"
-    echo -e "\t${CMSG}17${CEND}. eu-central-欧洲中部 1 (法兰克福) ${CMSG}18${CEND}. me-east-中东东部 1 (迪拜)"
+    echo -e "\t ${CMSG}7${CEND}. cn-shenzhen-华南 1 (深圳)         ${CMSG}8${CEND}. cn-chengdu-西南 1（成都）"
+    echo -e "\t ${CMSG}9${CEND}. cn-hongkong-香港                 ${CMSG}10${CEND}. us-west-美西 1 (硅谷)"
+    echo -e "\t${CMSG}11${CEND}. us-east-美东 1 (弗吉尼亚)        ${CMSG}12${CEND}. ap-southeast-亚太东南 1 (新加坡)"
+    echo -e "\t${CMSG}13${CEND}. ap-southeast-亚太东南 2 (悉尼)   ${CMSG}14${CEND}. ap-southeast-亚太东南 3 (吉隆坡)"
+    echo -e "\t${CMSG}15${CEND}. ap-southeast-亚太东南 5 (雅加达) ${CMSG}16${CEND}. ap-northeast-亚太东北 1 (日本)"
+    echo -e "\t${CMSG}17${CEND}. ap-south-亚太南部 1 (孟买)       ${CMSG}18${CEND}. eu-central-欧洲中部 1 (法兰克福)"
+    echo -e "\t${CMSG}19${CEND}. eu-west-英国（伦敦）             ${CMSG}20${CEND}. me-east-中东东部 1 (迪拜)"
     read -e -p "Please input a number:(Default 1 press Enter) " Location
     Location=${Location:-1}
-    if [[ "${Location}" =~ ^[1-9]$|^1[0-8]$ ]]; then
+    if [[ "${Location}" =~ ^[1-9]$|^1[0-9]$|^20$ ]]; then
       break
     else
-      echo "${CWARNING}input error! Please only input number 1~18${CEND}"
+      echo "${CWARNING}input error! Please only input number 1~20${CEND}"
     fi
   done
   [ "${Location}" == '1' ] && Host=oss-cn-hangzhou-internal.aliyuncs.com
@@ -213,17 +214,19 @@ if [ -n "`echo ${desc_bk} | grep -w 3`" ]; then
   [ "${Location}" == '5' ] && Host=oss-cn-zhangjiakou-internal.aliyuncs.com
   [ "${Location}" == '6' ] && Host=oss-cn-huhehaote-internal.aliyuncs.com
   [ "${Location}" == '7' ] && Host=oss-cn-shenzhen-internal.aliyuncs.com
-  [ "${Location}" == '8' ] && Host=oss-cn-hongkong-internal.aliyuncs.com
-  [ "${Location}" == '9' ] && Host=oss-us-west-1-internal.aliyuncs.com
-  [ "${Location}" == '10' ] && Host=oss-us-east-1-internal.aliyuncs.com
-  [ "${Location}" == '11' ] && Host=oss-ap-southeast-1-internal.aliyuncs.com
-  [ "${Location}" == '12' ] && Host=oss-ap-southeast-2-internal.aliyuncs.com
-  [ "${Location}" == '13' ] && Host=oss-ap-southeast-3-internal.aliyuncs.com
-  [ "${Location}" == '14' ] && Host=oss-ap-southeast-5-internal.aliyuncs.com
-  [ "${Location}" == '15' ] && Host=oss-ap-northeast-1-internal.aliyuncs.com
-  [ "${Location}" == '16' ] && Host=oss-ap-south-1-internal.aliyuncs.com
-  [ "${Location}" == '17' ] && Host=oss-eu-central-1-internal.aliyuncs.com
-  [ "${Location}" == '18' ] && Host=oss-me-east-1-internal.aliyuncs.com
+  [ "${Location}" == '8' ] && Host=oss-cn-chengdu-internal.aliyuncs.com
+  [ "${Location}" == '9' ] && Host=oss-cn-hongkong-internal.aliyuncs.com
+  [ "${Location}" == '10' ] && Host=oss-us-west-1-internal.aliyuncs.com
+  [ "${Location}" == '11' ] && Host=oss-us-east-1-internal.aliyuncs.com
+  [ "${Location}" == '12' ] && Host=oss-ap-southeast-1-internal.aliyuncs.com
+  [ "${Location}" == '13' ] && Host=oss-ap-southeast-2-internal.aliyuncs.com
+  [ "${Location}" == '14' ] && Host=oss-ap-southeast-3-internal.aliyuncs.com
+  [ "${Location}" == '15' ] && Host=oss-ap-southeast-5-internal.aliyuncs.com
+  [ "${Location}" == '16' ] && Host=oss-ap-northeast-1-internal.aliyuncs.com
+  [ "${Location}" == '17' ] && Host=oss-ap-south-1-internal.aliyuncs.com
+  [ "${Location}" == '18' ] && Host=oss-eu-central-1-internal.aliyuncs.com
+  [ "${Location}" == '19' ] && Host=oss-eu-west-1-internal.aliyuncs.com
+  [ "${Location}" == '20' ] && Host=oss-me-east-1-internal.aliyuncs.com
   [ "$(./include/check_port.py ${Host} 80)" == "False" ] && Host=`echo ${Host} | sed 's@-internal@@g'`
   [ -e "/root/.ossutilconfig" ] && rm -f /root/.ossutilconfig
   while :; do echo
@@ -259,12 +262,13 @@ if [ -n "`echo ${desc_bk} | grep -w 4`" ]; then
     echo -e "\t ${CMSG} 1${CEND}. ap-beijing-1-北京一区(华北)  ${CMSG}2${CEND}. ap-beijing-北京"
     echo -e "\t ${CMSG} 3${CEND}. ap-shanghai-上海(华东)       ${CMSG}4${CEND}. ap-guangzhou-广州(华南)"
     echo -e "\t ${CMSG} 5${CEND}. ap-chengdu-成都(西南)        ${CMSG}6${CEND}. ap-chongqing-重庆"
-    echo -e "\t ${CMSG} 7${CEND}. ap-singapore-新加坡          ${CMSG}8${CEND}. ap-hongkong-香港"
-    echo -e "\t ${CMSG} 9${CEND}. na-toronto-多伦多           ${CMSG}10${CEND}. eu-frankfurt-法兰克福"
-    echo -e "\t ${CMSG}11${CEND}. ap-mumbai-孟买              ${CMSG}12${CEND}. ap-seoul-首尔"
-    echo -e "\t ${CMSG}13${CEND}. na-siliconvalley-硅谷       ${CMSG}14${CEND}. na-ashburn-弗吉尼亚"
-    echo -e "\t ${CMSG}15${CEND}. ap-bangkok-曼谷             ${CMSG}16${CEND}. eu-moscow-莫斯科"
-    echo -e "\t ${CMSG}17${CEND}. ap-tokyo-东京"
+    echo -e "\t ${CMSG} 7${CEND}. ap-shenzhen-fsi-深圳金融     ${CMSG}8${CEND}. ap-shanghai-fsi-上海金融"
+    echo -e "\t ${CMSG} 9${CEND}. ap-beijing-fsi-北京金融     ${CMSG}10${CEND}. ap-hongkong-香港"
+    echo -e "\t ${CMSG}11${CEND}. ap-singapore-新加坡         ${CMSG}12${CEND}. ap-mumbai-孟买"
+    echo -e "\t ${CMSG}13${CEND}. ap-seoul-首尔               ${CMSG}14${CEND}. ap-bangkok-曼谷"
+    echo -e "\t ${CMSG}15${CEND}. ap-tokyo-东京               ${CMSG}16${CEND}. na-siliconvalley-硅谷"
+    echo -e "\t ${CMSG}17${CEND}. na-ashburn-弗吉尼亚         ${CMSG}18${CEND}. na-toronto-多伦多"
+    echo -e "\t ${CMSG}19${CEND}. eu-frankfurt-法兰克福       ${CMSG}20${CEND}. eu-moscow-莫斯科"
     read -e -p "Please input a number:(Default 1 press Enter) " Location
     Location=${Location:-1}
     if [[ "${Location}" =~ ^[1-9]$|^1[0-7]$ ]]; then
@@ -279,17 +283,20 @@ if [ -n "`echo ${desc_bk} | grep -w 4`" ]; then
   [ "${Location}" == '4' ] && REGION='ap-guangzhou'
   [ "${Location}" == '5' ] && REGION='ap-chengdu'
   [ "${Location}" == '6' ] && REGION='ap-chongqing'
-  [ "${Location}" == '7' ] && REGION='ap-singapore'
-  [ "${Location}" == '8' ] && REGION='ap-hongkong'
-  [ "${Location}" == '9' ] && REGION='na-toronto'
-  [ "${Location}" == '10' ] && REGION='eu-frankfurt'
-  [ "${Location}" == '11' ] && REGION='ap-mumbai'
-  [ "${Location}" == '12' ] && REGION='ap-seoul'
-  [ "${Location}" == '13' ] && REGION='na-siliconvalley'
-  [ "${Location}" == '14' ] && REGION='na-ashburn'
-  [ "${Location}" == '15' ] && REGION='ap-bangkok'
-  [ "${Location}" == '16' ] && REGION='eu-moscow'
-  [ "${Location}" == '17' ] && REGION='ap-tokyo'
+  [ "${Location}" == '7' ] && REGION='ap-shenzhen-fsi'
+  [ "${Location}" == '8' ] && REGION='ap-shanghai-fsi'
+  [ "${Location}" == '9' ] && REGION='ap-beijing-fsi'
+  [ "${Location}" == '10' ] && REGION='ap-hongkong'
+  [ "${Location}" == '11' ] && REGION='ap-singapore'
+  [ "${Location}" == '12' ] && REGION='ap-mumbai'
+  [ "${Location}" == '13' ] && REGION='ap-seoul'
+  [ "${Location}" == '14' ] && REGION='ap-bangkok'
+  [ "${Location}" == '15' ] && REGION='ap-tokyo'
+  [ "${Location}" == '16' ] && REGION='na-siliconvalley'
+  [ "${Location}" == '17' ] && REGION='na-ashburn'
+  [ "${Location}" == '18' ] && REGION='na-toronto'
+  [ "${Location}" == '19' ] && REGION='eu-frankfurt'
+  [ "${Location}" == '20' ] && REGION='eu-moscow'
   while :; do echo
     read -e -p "Please enter the Qcloud COS APPID: " APPID
     [[ ! "${APPID}" =~ ^[0-9]+$ ]] && { echo "${CWARNING}input error, must be a number${CEND}"; continue; }
@@ -368,12 +375,14 @@ if [ -n "`echo ${desc_bk} | grep -w 6`" ]; then
     chmod +x /usr/local/bin/qrsctl
   fi
   if [ ! -e "/usr/local/bin/qshell" ]; then
-    wget -qc http://devtools.qiniu.com/qshell-v2.4.0.zip -O /tmp/qshell-v2.4.0.zip
-    unzip -q /tmp/qshell-v2.4.0.zip -d /tmp/
     if [ "${OS_BIT}" == '64' ]; then
-      /bin/cp /tmp/qshell_linux_x64 /usr/local/bin/qshell
+      wget -qc http://devtools.qiniu.com/qshell-linux-x64-v2.4.0.zip -O /tmp/qshell-linux-x64-v2.4.0.zip
+      unzip -q /tmp/qshell-linux-x64-v2.4.0.zip -d /tmp/
+      /bin/cp /tmp/qshell-linux-x64-v2.4.0 /usr/local/bin/qshell
     elif [ "${OS_BIT}" == '32' ]; then
-      /bin/cp /tmp/qshell_linux_x86 /usr/local/bin/qshell
+      wget -qc http://devtools.qiniu.com/qshell-linux-x86-v2.4.0.zip -O /tmp/qshell-linux-x86-v2.4.0.zip
+      unzip -q /tmp/qshell-linux-x86-v2.4.0.zip -d /tmp/
+      /bin/cp /tmp/qshell-linux-x86-v2.4.0 /usr/local/bin/qshell
     fi
     chmod +x /usr/local/bin/qshell
     rm -f /tmp/qshell*

include/check_sw.sh

@@ -116,7 +116,7 @@ installDepsUbuntu() {
   apt-get -y upgrade -o Dir::Etc::SourceList=/tmp/security.sources.list
 
   # Install needed packages
-  pkgList="debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg8 libjpeg8-dev libpng-dev libpng12-0 libpng12-dev libpng3 libxml2 libxml2-dev zlib1g zlib1g-dev libc6 libc6-dev libc-client2007e-dev libglib2.0-0 libglib2.0-dev bzip2 libzip-dev libbz2-1.0 libncurses5 libncurses5-dev libaio1 libaio-dev numactl libreadline-dev curl libcurl3-gnutls libcurl4-gnutls-dev libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl libssl-dev libtool libevent-dev re2c libsasl2-dev libxslt1-dev libicu-dev libsqlite3-dev libcloog-ppl1 bison patch vim zip unzip tmux htop bc dc expect libexpat1-dev iptables rsyslog libonig-dev libtirpc-dev nss rsync git lsof lrzsz ntpdate psmisc wget sysv-rc"
+  pkgList="libperl-dev debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg8 libjpeg8-dev libpng-dev libpng12-0 libpng12-dev libpng3 libxml2 libxml2-dev zlib1g zlib1g-dev libc6 libc6-dev libc-client2007e-dev libglib2.0-0 libglib2.0-dev bzip2 libzip-dev libbz2-1.0 libncurses5 libncurses5-dev libaio1 libaio-dev numactl libreadline-dev curl libcurl3-gnutls libcurl4-gnutls-dev libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl libssl-dev libtool libevent-dev re2c libsasl2-dev libxslt1-dev libicu-dev libsqlite3-dev libcloog-ppl1 bison patch vim zip unzip tmux htop bc dc expect libexpat1-dev iptables rsyslog libonig-dev libtirpc-dev nss rsync git lsof lrzsz ntpdate psmisc wget sysv-rc"
   export DEBIAN_FRONTEND=noninteractive
   for Package in ${pkgList}; do
     apt-get --no-install-recommends -y install ${Package}