Fix ioncube zts

backup_setup.sh

@@ -37,9 +37,9 @@ while :; do echo
   echo -e "\t${CMSG}3${CEND}. Qcloud COS"
   echo -e "\t${CMSG}4${CEND}. UPYUN(又拍云)" 
   read -p "Please input a number:(Default 1 press Enter) " desc_bk
-  [ -z "$desc_bk" ] && desc_bk=1
+  [ -z "${desc_bk}" ] && desc_bk=1
   ary=(1 2 3 4 12 13 14 23 24 34 123 124 234 1234)
-  if [[ "${ary[@]}" =~ "$desc_bk" ]]; then
+  if [[ "${ary[@]}" =~ "${desc_bk}" ]]; then
     break
   else
     echo "${CWARNING}input error! Please only input number 1,2,12,23,234 and so on${CEND}"
@@ -47,10 +47,10 @@ while :; do echo
 done
 
 sed -i 's@^backup_destination=.*@backup_destination=@' ./options.conf
-[ `echo $desc_bk | grep -e 1` ] && sed -i 's@^backup_destination=.*@backup_destination=local@' ./options.conf
-[ `echo $desc_bk | grep -e 2` ] && sed -i 's@^backup_destination=.*@&,remote@' ./options.conf
-[ `echo $desc_bk | grep -e 3` ] && sed -i 's@^backup_destination=.*@&,cos@' ./options.conf
-[ `echo $desc_bk | grep -e 4` ] && sed -i 's@^backup_destination=.*@&,upyun@' ./options.conf
+[ `echo ${desc_bk} | grep -e 1` ] && sed -i 's@^backup_destination=.*@backup_destination=local@' ./options.conf
+[ `echo ${desc_bk} | grep -e 2` ] && sed -i 's@^backup_destination=.*@&,remote@' ./options.conf
+[ `echo ${desc_bk} | grep -e 3` ] && sed -i 's@^backup_destination=.*@&,cos@' ./options.conf
+[ `echo ${desc_bk} | grep -e 4` ] && sed -i 's@^backup_destination=.*@&,upyun@' ./options.conf
 sed -i 's@^backup_destination=,@backup_destination=@' ./options.conf
 
 while :; do echo
@@ -59,19 +59,19 @@ while :; do echo
   echo -e "\t${CMSG}2${CEND}. Only Website"
   echo -e "\t${CMSG}3${CEND}. Database and Website"
   read -p "Please input a number:(Default 1 press Enter) " content_bk
-  [ -z "$content_bk" ] && content_bk=1
-  if [[ ! $content_bk =~ ^[1-3]$ ]]; then
+  [ -z "${content_bk}" ] && content_bk=1
+  if [[ ! ${content_bk} =~ ^[1-3]$ ]]; then
     echo "${CWARNING}input error! Please only input number 1~3${CEND}"
   else
     break
   fi
 done
 
-[ "$content_bk" == '1' ] && sed -i 's@^backup_content=.*@backup_content=db@' ./options.conf
-[ "$content_bk" == '2' ] && sed -i 's@^backup_content=.*@backup_content=web@' ./options.conf
-[ "$content_bk" == '3' ] && sed -i 's@^backup_content=.*@backup_content=db,web@' ./options.conf
+[ "${content_bk}" == '1' ] && sed -i 's@^backup_content=.*@backup_content=db@' ./options.conf
+[ "${content_bk}" == '2' ] && sed -i 's@^backup_content=.*@backup_content=web@' ./options.conf
+[ "${content_bk}" == '3' ] && sed -i 's@^backup_content=.*@backup_content=db,web@' ./options.conf
 
-if [[ $desc_bk =~ ^[1,2]$ ]]; then
+if [[ ${desc_bk} =~ ^[1,2]$ ]]; then
   while :; do echo
     echo "Please enter the directory for save the backup file: "
     read -p "(Default directory: ${backup_dir}): " new_backup_dir
@@ -93,7 +93,7 @@ while :; do echo
 done
 sed -i "s@^expired_days=.*@expired_days=$expired_days@" ./options.conf
 
-if [ "$content_bk" != '2' ]; then
+if [ "${content_bk}" != '2' ]; then
   databases=`${db_install_dir}/bin/mysql -uroot -p$dbrootpwd -e "show databases\G" | grep Database | awk '{print $2}' | grep -Evw "(performance_schema|information_schema|mysql|sys)"`
   while :; do echo
     echo "Please enter one or more name for database, separate multiple database names with commas: "
@@ -110,7 +110,7 @@ if [ "$content_bk" != '2' ]; then
   sed -i "s@^db_name=.*@db_name=${db_name}@" ./options.conf
 fi
 
-if [ "$content_bk" != '1' ]; then
+if [ "${content_bk}" != '1' ]; then
   websites=`ls ${wwwroot_dir} | grep -vw default`
   while :; do echo
     echo "Please enter one or more name for website, separate multiple website names with commas: "
@@ -129,10 +129,10 @@ fi
 
 echo
 echo "You have to backup the content:"
-[ "$content_bk" != '2' ] && echo "Database: ${CMSG}${db_name}${CEND}"
-[ "$content_bk" != '1' ] && echo "Website: ${CMSG}${website_name}${CEND}"
+[ "${content_bk}" != '2' ] && echo "Database: ${CMSG}${db_name}${CEND}"
+[ "${content_bk}" != '1' ] && echo "Website: ${CMSG}${website_name}${CEND}"
 
-if [ `echo $desc_bk | grep -e 2` ]; then
+if [ `echo ${desc_bk} | grep -e 2` ]; then
   > tools/iplist.txt
   while :; do echo
     read -p "Please enter the remote host ip: " remote_ip
@@ -154,18 +154,18 @@ if [ `echo $desc_bk | grep -e 2` ]; then
       [ -z "`grep $remote_ip tools/iplist.txt`" ] && echo "$remote_ip $remote_port $remote_user $remote_password" >> tools/iplist.txt || echo "${CWARNING}$remote_ip has been added! ${CEND}"
       while :; do
         read -p "Do you want to add more host ? [y/n]: " more_host_yn
-        if [[ ! $more_host_yn =~ ^[y,n]$ ]]; then
+        if [[ ! ${more_host_yn} =~ ^[y,n]$ ]]; then
           echo "${CWARNING}input error! Please only input 'y' or 'n'${CEND}"
         else
           break
         fi
       done
-      [ "$more_host_yn" == 'n' ] && break
+      [ "${more_host_yn}" == 'n' ] && break
     fi
   done
 fi
 
-if [ `echo $desc_bk | grep -e 3` ]; then
+if [ `echo ${desc_bk} | grep -e 3` ]; then
   [ ! -e "${python_install_dir}/bin/python" ] && Install_Python
   [ ! -e "${python_install_dir}/lib/coscmd" ] && ${python_install_dir}/bin/pip install coscmd >/dev/null 2>&1 
   while :; do echo
@@ -176,36 +176,36 @@ if [ `echo $desc_bk | grep -e 3` ]; then
     echo -e "\t ${CMSG}7${CEND}. 香港            ${CMSG}8${CEND}. 多伦多"
     echo -e "\t ${CMSG}9${CEND}. 法兰克福"
     read -p "Please input a number:(Default 1 press Enter) " Location
-    [ -z "$Location" ] && Location=1
+    [ -z "${Location}" ] && Location=1
     if [ ${Location} -ge 1 >/dev/null 2>&1 -a ${Location} -le 9 >/dev/null 2>&1 ]; then
       break
     else
       echo "${CWARNING}input error! Please only input number 1~9${CEND}"
     fi
   done
-  [ "$Location" == '1' ] && region='ap-beijing-1'
-  [ "$Location" == '2' ] && region='ap-beijing'
-  [ "$Location" == '3' ] && region='ap-shanghai'
-  [ "$Location" == '4' ] && region='ap-guangzhou'
-  [ "$Location" == '5' ] && region='ap-chengdu'
-  [ "$Location" == '6' ] && region='ap-singapore'
-  [ "$Location" == '7' ] && region='ap-hongkong'
-  [ "$Location" == '8' ] && region='na-toronto'
-  [ "$Location" == '9' ] && region='eu-frankfurt'
+  [ "${Location}" == '1' ] && region='ap-beijing-1'
+  [ "${Location}" == '2' ] && region='ap-beijing'
+  [ "${Location}" == '3' ] && region='ap-shanghai'
+  [ "${Location}" == '4' ] && region='ap-guangzhou'
+  [ "${Location}" == '5' ] && region='ap-chengdu'
+  [ "${Location}" == '6' ] && region='ap-singapore'
+  [ "${Location}" == '7' ] && region='ap-hongkong'
+  [ "${Location}" == '8' ] && region='na-toronto'
+  [ "${Location}" == '9' ] && region='eu-frankfurt'
   while :; do echo
     read -p "Please enter the Qcloud COS APPID: " appid 
-    [ -z "$appid" ] && continue
+    [ -z "${appid}" ] && continue
     echo
     read -p "Please enter the Qcloud COS SecretId: " SecretId
-    [ -z "$SecretId" ] && continue
+    [ -z "${SecretId}" ] && continue
     echo
     read -p "Please enter the Qcloud COS SecretKey: " SecretKey
     [ -z "$SecretKey" ] && continue
     echo
     read -p "Please enter the Qcloud COS bucket: " bucket 
-    [ -z "$bucket" ] && continue
+    [ -z "${bucket}" ] && continue
     echo
-    ${python_install_dir}/bin/coscmd config -u $appid -a $SecretId -s $SecretKey -r $region -b $bucket >/dev/null 2>&1
+    ${python_install_dir}/bin/coscmd config -u ${appid} -a ${SecretId} -s $SecretKey -r $region -b ${bucket} >/dev/null 2>&1
     ${python_install_dir}/bin/coscmd list >/dev/null 2>&1
     if [ $? = 0 ]; then
       echo "${CMSG}appid/SecretId/SecretKey/region/bucket OK${CEND}"
@@ -217,26 +217,26 @@ if [ `echo $desc_bk | grep -e 3` ]; then
   done
 fi
 
-if [ `echo $desc_bk | grep -e 4` ]; then
+if [ `echo ${desc_bk} | grep -e 4` ]; then
   if [ ! -e "/usr/local/bin/upx" ] ;then
-    if [ "$OS_BIT" == '64' ]; then
+    if [ "${OS_BIT}" == '64' ]; then
       wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx-linux-amd64-v0.2.3 -O /usr/local/bin/upx
-    elif [ "$OS_BIT" == '32' ]; then
+    elif [ "${OS_BIT}" == '32' ]; then
       wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx-linux-386-v0.2.3 -O /usr/local/bin/upx
     fi
     chmod +x /usr/local/bin/upx
   fi
   while :; do echo
     read -p "Please enter the ServiceName: " ServiceName 
-    [ -z "$ServiceName" ] && continue
+    [ -z "${ServiceName}" ] && continue
     echo
     read -p "Please enter the Operator: " Operator 
-    [ -z "$Operator" ] && continue
+    [ -z "${Operator}" ] && continue
     echo
     read -p "Please enter the Password: " Password 
-    [ -z "$Password" ] && continue
+    [ -z "${Password}" ] && continue
     echo
-    /usr/local/bin/upx login $ServiceName $Operator $Password >/dev/null 2>&1
+    /usr/local/bin/upx login ${ServiceName} ${Operator} ${Password} >/dev/null 2>&1
     /usr/local/bin/upx ls >/dev/null 2>&1
     if [ $? = 0 ]; then
       echo "${CMSG}ServiceName/Operator/Password OK${CEND}"

include/download.sh

@@ -11,7 +11,7 @@
 Download_src() {
   [ -s "${src_url##*/}" ] && echo "[${CMSG}${src_url##*/}${CEND}] found" || { wget -4 --tries=6 -c --no-check-certificate $src_url; sleep 1; }
   if [ ! -e "${src_url##*/}" ]; then
-    echo "${CFAILURE}Auto download failed! You can manually download ${src_url##*/} into the oneinstack/src directory.${CEND}"
+    echo "${CFAILURE}Auto download failed! You can manually download ${src_url} into the oneinstack/src directory.${CEND}"
     kill -9 $$
   fi
 }

include/ioncube.sh

@@ -26,32 +26,67 @@ Install_ionCube() {
   [ ! -d "${phpExtensionDir}" ] && mkdir -p ${phpExtensionDir}
   case "${PHP_main_ver}" in
     7.2)
-      /bin/cp ioncube/ioncube_loader_lin_7.2.so ${phpExtensionDir}
-      zend_extension="${phpExtensionDir}/ioncube_loader_lin_7.2.so"
+      if [ -z "`echo $phpExtensionDir | grep 'non-zts'`" ]; then
+        /bin/cp ioncube/ioncube_loader_lin_7.2_ts.so ${phpExtensionDir}
+        zend_extension="${phpExtensionDir}/ioncube_loader_lin_7.2_ts.so"
+      else
+        /bin/cp ioncube/ioncube_loader_lin_7.2.so ${phpExtensionDir}
+        zend_extension="${phpExtensionDir}/ioncube_loader_lin_7.2.so"
+      fi
       ;;
     7.1)
-      /bin/cp ioncube/ioncube_loader_lin_7.1.so ${phpExtensionDir}
-      zend_extension="${phpExtensionDir}/ioncube_loader_lin_7.1.so"
+      if [ -z "`echo $phpExtensionDir | grep 'non-zts'`" ]; then
+        /bin/cp ioncube/ioncube_loader_lin_7.1_ts.so ${phpExtensionDir}
+        zend_extension="${phpExtensionDir}/ioncube_loader_lin_7.1_ts.so"
+      else
+        /bin/cp ioncube/ioncube_loader_lin_7.1.so ${phpExtensionDir}
+        zend_extension="${phpExtensionDir}/ioncube_loader_lin_7.1.so"
+      fi
       ;;
     7.0)
-      /bin/cp ioncube/ioncube_loader_lin_7.0.so ${phpExtensionDir}
-      zend_extension="${phpExtensionDir}/ioncube_loader_lin_7.0.so"
+      if [ -z "`echo $phpExtensionDir | grep 'non-zts'`" ]; then
+        /bin/cp ioncube/ioncube_loader_lin_7.0_ts.so ${phpExtensionDir}
+        zend_extension="${phpExtensionDir}/ioncube_loader_lin_7.0_ts.so"
+      else
+        /bin/cp ioncube/ioncube_loader_lin_7.0.so ${phpExtensionDir}
+        zend_extension="${phpExtensionDir}/ioncube_loader_lin_7.0.so"
+      fi
       ;;
     5.6)
-      /bin/cp ioncube/ioncube_loader_lin_5.6.so ${phpExtensionDir}
-      zend_extension="${phpExtensionDir}/ioncube_loader_lin_5.6.so"
+      if [ -z "`echo $phpExtensionDir | grep 'non-zts'`" ]; then
+        /bin/cp ioncube/ioncube_loader_lin_5.6_ts.so ${phpExtensionDir}
+        zend_extension="${phpExtensionDir}/ioncube_loader_lin_5.6_ts.so"
+      else
+        /bin/cp ioncube/ioncube_loader_lin_5.6.so ${phpExtensionDir}
+        zend_extension="${phpExtensionDir}/ioncube_loader_lin_5.6.so"
+      fi
       ;;
     5.5)
-     /bin/cp ioncube/ioncube_loader_lin_5.5.so ${phpExtensionDir}
-     zend_extension="${phpExtensionDir}/ioncube_loader_lin_5.5.so"
+      if [ -z "`echo $phpExtensionDir | grep 'non-zts'`" ]; then
+        /bin/cp ioncube/ioncube_loader_lin_5.5_ts.so ${phpExtensionDir}
+        zend_extension="${phpExtensionDir}/ioncube_loader_lin_5.5_ts.so"
+      else
+        /bin/cp ioncube/ioncube_loader_lin_5.5.so ${phpExtensionDir}
+        zend_extension="${phpExtensionDir}/ioncube_loader_lin_5.5.so"
+      fi
      ;;
     5.4)
-      /bin/cp ioncube/ioncube_loader_lin_5.4.so ${phpExtensionDir}
-      zend_extension="${phpExtensionDir}/ioncube_loader_lin_5.4.so"
+      if [ -z "`echo $phpExtensionDir | grep 'non-zts'`" ]; then
+        /bin/cp ioncube/ioncube_loader_lin_5.4_ts.so ${phpExtensionDir}
+        zend_extension="${phpExtensionDir}/ioncube_loader_lin_5.4_ts.so"
+      else
+        /bin/cp ioncube/ioncube_loader_lin_5.4.so ${phpExtensionDir}
+        zend_extension="${phpExtensionDir}/ioncube_loader_lin_5.4.so"
+      fi
       ;;
     5.3)
-      /bin/cp ioncube/ioncube_loader_lin_5.3.so ${phpExtensionDir}
-      zend_extension="${phpExtensionDir}/ioncube_loader_lin_5.3.so"
+      if [ -z "`echo $phpExtensionDir | grep 'non-zts'`" ]; then
+        /bin/cp ioncube/ioncube_loader_lin_5.3_ts.so ${phpExtensionDir}
+        zend_extension="${phpExtensionDir}/ioncube_loader_lin_5.3_ts.so"
+      else
+        /bin/cp ioncube/ioncube_loader_lin_5.3.so ${phpExtensionDir}
+        zend_extension="${phpExtensionDir}/ioncube_loader_lin_5.3.so"
+      fi
       ;;
     *)
       echo "Error! Your PHP ${PHP_detail_ver} does not support ionCube!"

versions.txt

@@ -55,7 +55,7 @@ curl_ver=7.58.0
 libmcrypt_ver=2.5.8
 mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
-imagemagick_ver=6.9.9-37
+imagemagick_ver=6.9.9-38
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.28
 gmagick_for_php7_ver=2.0.5RC1