[feat] Del JDK,32bit and Add openjdk

README.md

@@ -10,7 +10,7 @@ Script properties:
 - Providing multiple PHP versions (PHP-8.1, PHP-8.0, PHP-7.4, PHP-7.3, PHP-7.2, PHP-7.1, PHP-7.0, PHP-5.6, PHP-5.5, PHP-5.4, PHP-5.3)
 - Provide Nginx, Tengine, OpenResty, Apache and ngx_lua_waf
 - Providing a plurality of Tomcat version (Tomcat-10, Tomcat-9, Tomcat-8, Tomcat-7)
-- Providing a plurality of JDK version (JDK-11.0, JDK-1.8, JDK-1.7, JDK-1.6)
+- Providing a plurality of OpenJDK version (OpenJDK-8, OpenJDK-11)
 - According to their needs to install PHP Cache Accelerator provides ZendOPcache, xcache, apcu, eAccelerator. And php extensions,include ZendGuardLoader,ionCube,SourceGuardian,imagick,gmagick,fileinfo,imap,ldap,calendar,phalcon,yaf,yar,redis,memcached,memcache,mongodb,swoole,xdebug
 - Installation Nodejs, Pureftpd, phpMyAdmin according to their needs
 - Install memcached, redis according to their needs

backup_setup.sh

@@ -183,9 +183,9 @@ fi
 if [ -n "`echo ${desc_bk} | grep -w 3`" ]; then
   if [ ! -e "/usr/local/bin/ossutil" ]; then
     if [ "${armplatform}" == 'y' ]; then
-      wget -qc https://gosspublic.alicdn.com/ossutil/1.7.9/ossutilarm${OS_BIT} -O /usr/local/bin/ossutil
+      wget -qc https://gosspublic.alicdn.com/ossutil/1.7.10/ossutilarm64 -O /usr/local/bin/ossutil
     else
-      wget -qc https://gosspublic.alicdn.com/ossutil/1.7.9/ossutil${OS_BIT} -O /usr/local/bin/ossutil
+      wget -qc https://gosspublic.alicdn.com/ossutil/1.7.10/ossutil64 -O /usr/local/bin/ossutil
     fi
     chmod +x /usr/local/bin/ossutil
   fi
@@ -350,17 +350,12 @@ fi
 
 if [ -n "`echo ${desc_bk} | grep -w 5`" ]; then
   if [ ! -e "/usr/local/bin/upx" ]; then
-    if [ "${OS_BIT}" == '64' ]; then
-      if [ "${armplatform}" == 'y' ]; then
-        wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx_0.3.6_linux_arm64.tar.gz -O /tmp/upx_0.3.6_linux_arm64.tar.gz
-        tar xzf /tmp/upx_0.3.6_linux_arm64.tar.gz -C /tmp/
-      else
-        wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx_0.3.6_linux_x86_64.tar.gz -O /tmp/upx_0.3.6_linux_x86_64.tar.gz
-        tar xzf /tmp/upx_0.3.6_linux_x86_64.tar.gz -C /tmp/
-      fi
-    elif [ "${OS_BIT}" == '32' ]; then
-      wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx_0.3.6_linux_i386.tar.gz -O /tmp/upx_0.3.6_linux_i386.tar.gz
-      tar xzf /tmp/upx_0.3.6_linux_i386.tar.gz -C /tmp/
+    if [ "${armplatform}" == 'y' ]; then
+      wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx_0.3.6_linux_arm64.tar.gz -O /tmp/upx_0.3.6_linux_arm64.tar.gz
+      tar xzf /tmp/upx_0.3.6_linux_arm64.tar.gz -C /tmp/
+    else
+      wget -qc http://collection.b0.upaiyun.com/softwares/upx/upx_0.3.6_linux_x86_64.tar.gz -O /tmp/upx_0.3.6_linux_x86_64.tar.gz
+      tar xzf /tmp/upx_0.3.6_linux_x86_64.tar.gz -C /tmp/
     fi
     /bin/mv /tmp/upx /usr/local/bin/upx
     chmod +x /usr/local/bin/upx
@@ -389,22 +384,12 @@ fi
 
 if [ -n "`echo ${desc_bk} | grep -w 6`" ]; then
   if [ ! -e "/usr/local/bin/qshell" ]; then
-    if [ "${OS_BIT}" == '64' ]; then
-      if [ "${armplatform}" == 'y' ]; then
-        wget -qc https://devtools.qiniu.com/qshell-v2.6.2-linux-arm64.tar.gz -O /tmp/qshell-v2.6.2-linux-arm64.tar.gz
-	tar xzf /tmp/qshell-v2.6.2-linux-arm64.tar.gz -C /usr/local/bin/
-      else
-        wget -qc https://devtools.qiniu.com/qshell-v2.6.2-linux-amd64.tar.gz -O /tmp/qshell-v2.6.2-linux-amd64.tar.gz
-        tar xzf /tmp/qshell-v2.6.2-linux-amd64.tar.gz -C /usr/local/bin/
-      fi
-    elif [ "${OS_BIT}" == '32' ]; then
-      if [ "${armplatform}" == 'y' ]; then
-        wget -qc https://devtools.qiniu.com/qshell-v2.6.2-linux-arm.tar.gz -O /tmp/qshell-v2.6.2-linux-arm.tar.gz
-        tar xzf /tmp/qshell-v2.6.2-linux-arm.tar.gz -C /usr/local/bin/
-      else
-        wget -qc https://devtools.qiniu.com/qshell-v2.6.2-linux-386.tar.gz -O /tmp/qshell-v2.6.2-linux-386.tar.gz
-        tar xzf /tmp/qshell-v2.6.2-linux-386.tar.gz -C /usr/local/bin/
-      fi
+    if [ "${armplatform}" == 'y' ]; then
+      wget -qc https://devtools.qiniu.com/qshell-v2.6.2-linux-arm64.tar.gz -O /tmp/qshell-v2.6.2-linux-arm64.tar.gz
+      tar xzf /tmp/qshell-v2.6.2-linux-arm64.tar.gz -C /usr/local/bin/
+    else
+      wget -qc https://devtools.qiniu.com/qshell-v2.6.2-linux-amd64.tar.gz -O /tmp/qshell-v2.6.2-linux-amd64.tar.gz
+      tar xzf /tmp/qshell-v2.6.2-linux-amd64.tar.gz -C /usr/local/bin/
     fi
     chmod +x /usr/local/bin/qshell
     rm -f /tmp/qshell*
@@ -535,7 +520,9 @@ fi
 
 if [ -n "`echo ${desc_bk} | grep -w 8`" ]; then
   if [ ! -e "/usr/local/bin/dbxcli" ]; then
-    if [ "${OS_BIT}" == '64' ]; then
+    if [ "${armplatform}" == 'y' ]; then
+      wget -qc http://mirrors.linuxeye.com/oneinstack/src/dbxcli-linux-arm -O /usr/local/bin/dbxcli
+    else
       wget -qc http://mirrors.linuxeye.com/oneinstack/src/dbxcli-linux-amd64 -O /usr/local/bin/dbxcli
     fi
     chmod +x /usr/local/bin/dbxcli

include/ZendGuardLoader.sh

@@ -18,24 +18,24 @@ Install_ZendGuardLoader() {
     if [ -n "`echo $phpExtensionDir | grep 'non-zts'`" ] && [ "${armplatform}" != 'y' ]; then
       case "${PHP_main_ver}" in
         5.6)
-          tar xzf zend-loader-php5.6-linux-${SYS_BIT_c}.tar.gz
-          /bin/mv zend-loader-php5.6-linux-${SYS_BIT_c}/ZendGuardLoader.so ${phpExtensionDir}
-          rm -rf zend-loader-php5.6-linux-${SYS_BIT_c}
+          tar xzf zend-loader-php5.6-linux-x86_64.tar.gz
+          /bin/mv zend-loader-php5.6-linux-x86_64/ZendGuardLoader.so ${phpExtensionDir}
+          rm -rf zend-loader-php5.6-linux-x86_64
           ;;
         5.5)
-          tar xzf zend-loader-php5.5-linux-${SYS_BIT_c}.tar.gz
-          /bin/mv zend-loader-php5.5-linux-${SYS_BIT_c}/ZendGuardLoader.so ${phpExtensionDir}
-          rm -rf zend-loader-php5.5-linux-${SYS_BIT_c}
+          tar xzf zend-loader-php5.5-linux-x86_64.tar.gz
+          /bin/mv zend-loader-php5.5-linux-x86_64/ZendGuardLoader.so ${phpExtensionDir}
+          rm -rf zend-loader-php5.5-linux-x86_64
           ;;
         5.4)
-          tar xzf ZendGuardLoader-70429-PHP-5.4-linux-glibc23-${SYS_BIT_c}.tar.gz
-          /bin/mv ZendGuardLoader-70429-PHP-5.4-linux-glibc23-${SYS_BIT_c}/php-5.4.x/ZendGuardLoader.so ${phpExtensionDir}
-          rm -rf ZendGuardLoader-70429-PHP-5.4-linux-glibc23-${SYS_BIT_c}
+          tar xzf ZendGuardLoader-70429-PHP-5.4-linux-glibc23-x86_64.tar.gz
+          /bin/mv ZendGuardLoader-70429-PHP-5.4-linux-glibc23-x86_64/php-5.4.x/ZendGuardLoader.so ${phpExtensionDir}
+          rm -rf ZendGuardLoader-70429-PHP-5.4-linux-glibc23-x86_64
           ;;
         5.3)
-          tar xzf ZendGuardLoader-php-5.3-linux-glibc23-${SYS_BIT_c}.tar.gz
-          /bin/mv ZendGuardLoader-php-5.3-linux-glibc23-${SYS_BIT_c}/php-5.3.x/ZendGuardLoader.so ${phpExtensionDir}
-          rm -rf ZendGuardLoader-php-5.3-linux-glibc23-${SYS_BIT_c}
+          tar xzf ZendGuardLoader-php-5.3-linux-glibc23-x86_64.tar.gz
+          /bin/mv ZendGuardLoader-php-5.3-linux-glibc23-x86_64/php-5.3.x/ZendGuardLoader.so ${phpExtensionDir}
+          rm -rf ZendGuardLoader-php-5.3-linux-glibc23-x86_64
           ;;
         *)
           echo "${CWARNING}Your php ${PHP_detail_ver} does not support ZendGuardLoader! ${CEND}";

include/check_download.sh

@@ -88,27 +88,8 @@ checkDownload() {
       ;;
   esac
 
-  # jdk
-  if [[ "${jdk_option}"  =~ ^[1-4]$ ]]; then
-    case "${jdk_option}" in
-      1)
-        echo "Download JDK 11.0..."
-        JDK_FILE="jdk-${jdk110_ver}_linux-${SYS_BIT_j}_bin.tar.gz"
-        ;;
-      2)
-        echo "Download JDK 1.8..."
-        JDK_FILE="jdk-$(echo ${jdk18_ver} | awk -F. '{print $2}')u$(echo ${jdk18_ver} | awk -F_ '{print $NF}')-linux-${SYS_BIT_j}.tar.gz"
-        ;;
-      3)
-        echo "Download JDK 1.7..."
-        JDK_FILE="jdk-$(echo ${jdk17_ver} | awk -F. '{print $2}')u$(echo ${jdk17_ver} | awk -F_ '{print $NF}')-linux-${SYS_BIT_j}.tar.gz"
-        ;;
-      4)
-        echo "Download JDK 1.6..."
-        JDK_FILE="jdk-$(echo ${jdk16_ver} | awk -F. '{print $2}')u$(echo ${jdk16_ver} | awk -F_ '{print $NF}')-linux-${SYS_BIT_j}.bin"
-        ;;
-    esac
-    src_url=http://mirrors.linuxeye.com/jdk/${JDK_FILE} && Download_src
+  # openjdk apr
+  if [[ "${openjdk_option}"  =~ ^[1-2]$ ]]; then
     echo "Download apr..."
     src_url=http://archive.apache.org/dist/apr/apr-${apr_ver}.tar.gz && Download_src
   fi
@@ -137,7 +118,7 @@ checkDownload() {
 
         if [ "${dbinstallmethod}" == '1' ]; then
           echo "Download MySQL 8.0 binary package..."
-          FILE_NAME=mysql-${mysql80_ver}-linux-glibc2.12-${SYS_BIT_b}.tar.xz
+          FILE_NAME=mysql-${mysql80_ver}-linux-glibc2.12-x86_64.tar.xz
         elif [ "${dbinstallmethod}" == '2' ]; then
           echo "Download MySQL 8.0 source package..."
           FILE_NAME=mysql-${mysql80_ver}.tar.gz
@@ -172,7 +153,7 @@ checkDownload() {
 
         if [ "${dbinstallmethod}" == '1' ]; then
           echo "Download MySQL 5.7 binary package..."
-          FILE_NAME=mysql-${mysql57_ver}-linux-glibc2.12-${SYS_BIT_b}.tar.gz
+          FILE_NAME=mysql-${mysql57_ver}-linux-glibc2.12-x86_64.tar.gz
         elif [ "${dbinstallmethod}" == '2' ]; then
           echo "Download MySQL 5.7 source package..."
           FILE_NAME=mysql-${mysql57_ver}.tar.gz
@@ -207,7 +188,7 @@ checkDownload() {
 
         if [ "${dbinstallmethod}" == '1' ]; then
           echo "Download MySQL 5.6 binary package..."
-          FILE_NAME=mysql-${mysql56_ver}-linux-glibc2.12-${SYS_BIT_b}.tar.gz
+          FILE_NAME=mysql-${mysql56_ver}-linux-glibc2.12-x86_64.tar.gz
         elif [ "${dbinstallmethod}" == '2' ]; then
           echo "Download MySQL 5.6 source package..."
           FILE_NAME=mysql-${mysql56_ver}.tar.gz
@@ -242,7 +223,7 @@ checkDownload() {
 
         if [ "${dbinstallmethod}" == '1' ]; then
           echo "Download MySQL 5.5 binary package..."
-          FILE_NAME=mysql-${mysql55_ver}-linux-glibc2.12-${SYS_BIT_b}.tar.gz
+          FILE_NAME=mysql-${mysql55_ver}-linux-glibc2.12-x86_64.tar.gz
         elif [ "${dbinstallmethod}" == '2' ]; then
           echo "Download MySQL 5.5 source package..."
           FILE_NAME=mysql-${mysql55_ver}.tar.gz
@@ -282,8 +263,8 @@ checkDownload() {
         esac
 
         if [ "${dbinstallmethod}" == '1' ]; then
-          FILE_NAME=mariadb-${mariadb_ver}-linux-systemd-${SYS_BIT_b}.tar.gz
-	  FILE_TYPE=bintar-linux-systemd-${SYS_BIT_a}
+          FILE_NAME=mariadb-${mariadb_ver}-linux-systemd-x86_64.tar.gz
+	  FILE_TYPE=bintar-linux-systemd-x86_64
         elif [ "${dbinstallmethod}" == '2' ]; then
           FILE_NAME=mariadb-${mariadb_ver}.tar.gz
 	  FILE_TYPE=source
@@ -322,7 +303,7 @@ checkDownload() {
         # Percona 8.0
         if [ "${dbinstallmethod}" == '1' ]; then
           echo "Download Percona 8.0 binary package..."
-          FILE_NAME=Percona-Server-${percona80_ver}-Linux.${SYS_BIT_b}.glibc2.17.tar.gz
+          FILE_NAME=Percona-Server-${percona80_ver}-Linux.x86_64.glibc2.17.tar.gz
           DOWN_ADDR_PERCONA=https://downloads.percona.com/downloads/Percona-Server-8.0/Percona-Server-${percona80_ver}/binary/tarball
         elif [ "${dbinstallmethod}" == '2' ]; then
           echo "Download Percona 8.0 source package..."
@@ -354,7 +335,7 @@ checkDownload() {
         # Precona 5.7
         if [ "${dbinstallmethod}" == '1' ]; then
           echo "Download Percona 5.7 binary package..."
-          FILE_NAME=Percona-Server-${percona57_ver}-Linux.${SYS_BIT_b}.glibc2.12.tar.gz
+          FILE_NAME=Percona-Server-${percona57_ver}-Linux.x86_64.glibc2.12.tar.gz
           DOWN_ADDR_PERCONA=https://downloads.percona.com/downloads/Percona-Server-5.7/Percona-Server-${percona57_ver}/binary/tarball
         elif [ "${dbinstallmethod}" == '2' ]; then
           echo "Download Percona 5.7 source package..."
@@ -387,7 +368,7 @@ checkDownload() {
         if [ "${dbinstallmethod}" == '1' ]; then
           echo "Download Percona 5.6 binary package..."
           perconaVerStr1=$(echo ${percona56_ver} | sed "s@-@-rel@")
-          FILE_NAME=Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
+          FILE_NAME=Percona-Server-${perconaVerStr1}-Linux.x86_64.${sslLibVer}.tar.gz
           DOWN_ADDR_PERCONA=https://downloads.percona.com/downloads/Percona-Server-5.6/Percona-Server-${percona56_ver}/binary/tarball
         elif [ "${dbinstallmethod}" == '2' ]; then
           echo "Download Percona 5.6 source package..."
@@ -420,7 +401,7 @@ checkDownload() {
         if [ "${dbinstallmethod}" == '1' ]; then
           echo "Download Percona 5.5 binary package..."
           perconaVerStr1=$(echo ${percona55_ver} | sed "s@-@-rel@")
-          FILE_NAME=Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
+          FILE_NAME=Percona-Server-${perconaVerStr1}-Linux.x86_64.${sslLibVer}.tar.gz
           DOWN_ADDR_PERCONA=https://downloads.percona.com/downloads/Percona-Server-5.5/Percona-Server-${percona55_ver}/binary/tarball
         elif [ "${dbinstallmethod}" == '2' ]; then
           echo "Download Percona 5.5 source package..."
@@ -475,7 +456,7 @@ checkDownload() {
       14)
         # MongoDB
         echo "Download MongoDB binary package..."
-        FILE_NAME=mongodb-linux-${SYS_BIT_b}-${mongodb_ver}.tgz
+        FILE_NAME=mongodb-linux-x86_64-${mongodb_ver}.tgz
         if [ "${IPADDR_COUNTRY}"x == "CN"x ]; then
           DOWN_ADDR_MongoDB=${mirrorLink}
         else
@@ -593,19 +574,19 @@ checkDownload() {
     case "${php_option}" in
       4)
         echo "Download zend loader for php 5.6..."
-        src_url=${mirrorLink}/zend-loader-php5.6-linux-${SYS_BIT_c}.tar.gz && Download_src
+        src_url=${mirrorLink}/zend-loader-php5.6-linux-x86_64.tar.gz && Download_src
         ;;
       3)
         echo "Download zend loader for php 5.5..."
-        src_url=${mirrorLink}/zend-loader-php5.5-linux-${SYS_BIT_c}.tar.gz && Download_src
+        src_url=${mirrorLink}/zend-loader-php5.5-linux-x86_64.tar.gz && Download_src
         ;;
       2)
         echo "Download zend loader for php 5.4..."
-        src_url=${mirrorLink}/ZendGuardLoader-70429-PHP-5.4-linux-glibc23-${SYS_BIT_c}.tar.gz && Download_src
+        src_url=${mirrorLink}/ZendGuardLoader-70429-PHP-5.4-linux-glibc23-x86_64.tar.gz && Download_src
         ;;
       1)
         echo "Download zend loader for php 5.3..."
-        src_url=${mirrorLink}/ZendGuardLoader-php-5.3-linux-glibc23-${SYS_BIT_c}.tar.gz && Download_src
+        src_url=${mirrorLink}/ZendGuardLoader-php-5.3-linux-glibc23-x86_64.tar.gz && Download_src
         ;;
     esac
   fi
@@ -613,17 +594,13 @@ checkDownload() {
   # ioncube
   if [ "${pecl_ioncube}" == '1' ]; then
     echo "Download ioncube..."
-    src_url=https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_${SYS_BIT_d}.tar.gz && Download_src
+    src_url=https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_${SYS_ARCH_i}.tar.gz && Download_src
   fi
 
   # SourceGuardian
   if [ "${pecl_sourceguardian}" == '1' ]; then
     echo "Download SourceGuardian..."
-    if [ "${TARGET_ARCH}" == "armv8" ]; then
-      src_url=https://www.sourceguardian.com/loaders/download/loaders.linux-aarch64.tar.gz && Download_src
-    else
-      src_url=${mirrorLink}/loaders.linux-${SYS_BIT_c}.tar.gz && Download_src
-    fi
+    src_url=${mirrorLink}/loaders.linux-${ARCH}.tar.gz && Download_src
   fi
 
   # imageMagick
@@ -716,7 +693,7 @@ checkDownload() {
   if [ "${nodejs_flag}" == 'y' ]; then
     echo "Download Nodejs..."
     [ "${IPADDR_COUNTRY}"x == "CN"x ] && DOWN_ADDR_NODE=https://nodejs.org/dist || DOWN_ADDR_NODE=https://mirrors.tuna.tsinghua.edu.cn/nodejs-release
-    src_url=${DOWN_ADDR_NODE}/v${nodejs_ver}/node-v${nodejs_ver}-linux-${SYS_BIT_n}.tar.gz && Download_src
+    src_url=${DOWN_ADDR_NODE}/v${nodejs_ver}/node-v${nodejs_ver}-linux-${SYS_ARCH_n}.tar.gz && Download_src
   fi
 
   # pureftpd
@@ -735,11 +712,5 @@ checkDownload() {
     fi
   fi
 
-  # autoconf for RHEL6
-  if [ "${downloadDepsSrc}" == '1' ] && [ "${RHEL_ver}" == '6' ]; then
-    echo "Download autoconf rpm for RHEL6..."
-    src_url=${mirrorLink}/autoconf-2.69-12.2.noarch.rpm && Download_src
-  fi
-
   popd > /dev/null
 }

include/check_os.sh

@@ -37,6 +37,7 @@ command -v lsb_release >/dev/null 2>&1 || { echo "${CFAILURE}${PM} source failed
 
 # Get OS Version
 OS=$(lsb_release -is)
+ARCH=$(arch)
 if [[ "${OS}" =~ ^CentOS$|^CentOSStream$|^RedHat$|^Rocky$|^AlmaLinux$|^Fedora$|^Amazon$|^AlibabaCloud$|^AlibabaCloud\(AliyunLinux\)$|^AnolisOS$|^EulerOS$|^openEuler$|^Oracle$ ]]; then
   LikeOS=RHEL
   RHEL_ver=$(lsb_release -rs | awk -F. '{print $1}' | awk '{print $1}')
@@ -65,8 +66,8 @@ elif [[ "${OS}" =~ ^Ubuntu$|^LinuxMint$|^elementary$ ]]; then
 fi
 
 # Check OS Version
-if [ ${RHEL_ver} -lt 6 >/dev/null 2>&1 ] || [ ${Debian_ver} -lt 8 >/dev/null 2>&1 ] || [ ${Ubuntu_ver} -lt 16 >/dev/null 2>&1 ]; then
-  echo "${CFAILURE}Does not support this OS, Please install CentOS 6+,Debian 8+,Ubuntu 16+ ${CEND}"
+if [ ${RHEL_ver} -lt 7 >/dev/null 2>&1 ] || [ ${Debian_ver} -lt 8 >/dev/null 2>&1 ] || [ ${Ubuntu_ver} -lt 16 >/dev/null 2>&1 ]; then
+  echo "${CFAILURE}Does not support this OS, Please install CentOS 7+,Debian 8+,Ubuntu 16+ ${CEND}"
   kill -9 $$; exit 1;
 fi
 
@@ -93,23 +94,18 @@ if [ "$(uname -r | awk -F- '{print $3}' 2>/dev/null)" == "Microsoft" ]; then
 fi
 
 if [ "$(getconf WORD_BIT)" == "32" ] && [ "$(getconf LONG_BIT)" == "64" ]; then
-  OS_BIT=64
-  SYS_BIT_j=x64 #jdk
-  SYS_BIT_a=x86_64 #mariadb
-  SYS_BIT_b=x86_64 #mariadb
-  SYS_BIT_c=x86_64 #ZendGuardLoader
-  SYS_BIT_d=x86-64 #ioncube
-  SYS_BIT_n=x64 #nodejs
-  [ "${TARGET_ARCH}" == 'aarch64' ] && { SYS_BIT_j=aarch64; SYS_BIT_c=aarch64; SYS_BIT_d=aarch64; SYS_BIT_n=arm64; }
+  if [ "${TARGET_ARCH}" == 'aarch64' ]; then
+    SYS_ARCH=arm64
+    SYS_ARCH_i=aarch64
+    SYS_ARCH_n=arm64
+  else
+    SYS_ARCH=amd64 #openjdk
+    SYS_ARCH_i=x86-64 #ioncube
+    SYS_ARCH_n=x64 #nodejs
+  fi
 else
-  OS_BIT=32
-  SYS_BIT_j=i586
-  SYS_BIT_a=x86
-  SYS_BIT_b=i686
-  SYS_BIT_c=i386
-  SYS_BIT_d=x86
-  SYS_BIT_n=x86
-  [ "${TARGET_ARCH}" == 'armv7' ] && { SYS_BIT_j=arm32-vfp-hflt; SYS_BIT_c=armhf; SYS_BIT_d=armv7l; SYS_BIT_n=armv7l; }
+  echo "${CWARNING}32-bit OS are not supported! ${CEND}"
+  kill -9 $$; exit 1;
 fi
 
 THREAD=$(grep 'processor' /proc/cpuinfo | sort -u | wc -l)
@@ -117,7 +113,7 @@ THREAD=$(grep 'processor' /proc/cpuinfo | sort -u | wc -l)
 # Percona binary: https://www.percona.com/doc/percona-server/5.7/installation.html#installing-percona-server-from-a-binary-tarball
 if [ ${Debian_ver} -lt 9 >/dev/null 2>&1 ]; then
   sslLibVer=ssl100
-elif [[ "${RHEL_ver}" =~ ^[6-7]$ ]] && [ "${OS}" != 'Fedora' ]; then
+elif [ "${RHEL_ver}" == '7' ] && [ "${OS}" != 'Fedora' ]; then
   sslLibVer=ssl101
 elif [ ${Debian_ver} -ge 9 >/dev/null 2>&1 ] || [ ${Ubuntu_ver} -ge 16 >/dev/null 2>&1 ]; then
   sslLibVer=ssl102

include/check_sw.sh

@@ -39,10 +39,10 @@ installDepsDebian() {
   # Install needed packages
   case "${Debian_ver}" in
     8)
-      pkgList="debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg8 libjpeg62-turbo-dev libjpeg-dev libpng12-0 libpng12-dev libpng3 libgd-dev 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-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl net-tools libssl-dev libtool libevent-dev bison re2c libsasl2-dev libxslt1-dev libxslt-dev libicu-dev locales libcloog-ppl0 patch vim zip unzip tmux htop bc dc expect libexpat1-dev libonig-dev libtirpc-dev nss rsync git lsof lrzsz iptables rsyslog cron logrotate ntpdate libsqlite3-dev psmisc wget sysv-rc ca-certificates"
+      pkgList="debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg8 libjpeg62-turbo-dev libjpeg-dev libpng12-0 libpng12-dev libpng3 libgd-dev 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-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl net-tools libssl-dev libtool libevent-dev bison re2c libsasl2-dev libxslt1-dev libxslt-dev libicu-dev locales libcloog-ppl0 patch vim zip unzip tmux htop bc dc expect libexpat1-dev libonig-dev libtirpc-dev nss rsync git lsof lrzsz iptables rsyslog cron logrotate chrony ntpdate libsqlite3-dev psmisc wget sysv-rc apt-transport-https ca-certificates software-properties-common"
       ;;
     9|10|11)
-      pkgList="debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg62-turbo-dev libjpeg-dev libpng-dev libgd-dev 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-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl net-tools libssl-dev libtool libevent-dev bison re2c libsasl2-dev libxslt1-dev libicu-dev locales patch vim zip unzip tmux htop bc dc expect libexpat1-dev libonig-dev libtirpc-dev rsync git lsof lrzsz iptables rsyslog cron logrotate ntpdate libsqlite3-dev psmisc wget sysv-rc ca-certificates"
+      pkgList="debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf libjpeg62-turbo-dev libjpeg-dev libpng-dev libgd-dev 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-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl net-tools libssl-dev libtool libevent-dev bison re2c libsasl2-dev libxslt1-dev libicu-dev locales patch vim zip unzip tmux htop bc dc expect libexpat1-dev libonig-dev libtirpc-dev rsync git lsof lrzsz iptables rsyslog cron logrotate chrony ntpdate libsqlite3-dev psmisc wget sysv-rc apt-transport-https ca-certificates software-properties-common"
       ;;
     *)
       echo "${CFAILURE}Your system Debian ${Debian_ver} are not supported!${CEND}"
@@ -56,30 +56,27 @@ installDepsDebian() {
 
 installDepsRHEL() {
   [ -e '/etc/yum.conf' ] && sed -i 's@^exclude@#exclude@' /etc/yum.conf
-  # Uninstall the conflicting packages
-  echo "${CMSG}Removing the conflicting packages...${CEND}"
   if [ "${RHEL_ver}" == '8' ]; then
-    ARCH=$( /bin/arch )
-    dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
-    if [[ "$(lsb_release -is)" =~ "RedHat" ]]; then
+    if [[ "${OS}" =~ "RedHat" ]]; then
       subscription-manager repos --enable codeready-builder-for-rhel-8-${ARCH}-rpms
       dnf -y install chrony oniguruma-devel rpcgen
-    elif [[ "$(lsb_release -is)" =~ "Oracle" ]]; then
+    elif [[ "${OS}" =~ "Oracle" ]]; then
       dnf config-manager --set-enabled ol8_codeready_builder
       dnf -y install chrony oniguruma-devel rpcgen
-    elif grep -qw "^\[PowerTools\]" /etc/yum.repos.d/*.repo; then
-      dnf -y --enablerepo=PowerTools install chrony oniguruma-devel rpcgen
     else
-      dnf -y --enablerepo=powertools install chrony oniguruma-devel rpcgen
+      [ -z "`grep -w epel /etc/yum.repos.d/*.repo`" ] && yum -y install epel-release
+      if grep -qw "^\[PowerTools\]" /etc/yum.repos.d/*.repo; then
+        dnf -y --enablerepo=PowerTools install chrony oniguruma-devel rpcgen
+      else
+        dnf -y --enablerepo=powertools install chrony oniguruma-devel rpcgen
+      fi
     fi
     systemctl enable chronyd
     systemctl stop firewalld && systemctl mask firewalld.service
   elif [ "${RHEL_ver}" == '7' ]; then
-    yum -y install epel-release
+    [ -z "`grep -w epel /etc/yum.repos.d/*.repo`" ] && yum -y install epel-release
     yum -y groupremove "Basic Web Server" "MySQL Database server" "MySQL Database client"
     systemctl stop firewalld && systemctl mask firewalld.service
-  elif [ "${RHEL_ver}" == '6' ]; then
-    yum -y groupremove "FTP Server" "PostgreSQL Database client" "PostgreSQL Database server" "MySQL Database server" "MySQL Database client" "Web Server"
   fi
 
   if [ ${RHEL_ver} -ge 7 >/dev/null 2>&1 ] && [ "${iptables_flag}" == 'y' ]; then
@@ -90,7 +87,7 @@ installDepsRHEL() {
 
   echo "${CMSG}Installing dependencies packages...${CEND}"
   # Install needed packages
-  pkgList="deltarpm drpm gcc gcc-c++ make cmake autoconf libjpeg libjpeg-devel libjpeg-turbo libjpeg-turbo-devel libpng libpng-devel libxml2 libxml2-devel zlib zlib-devel libzip libzip-devel glibc glibc-devel krb5-devel libc-client libc-client-devel glib2 glib2-devel bzip2 bzip2-devel ncurses ncurses-devel libaio numactl numactl-libs readline-devel curl curl-devel e2fsprogs e2fsprogs-devel krb5-devel libidn libidn-devel openssl openssl-devel net-tools libxslt-devel libicu-devel libevent-devel libtool libtool-ltdl bison gd-devel vim-enhanced pcre-devel libmcrypt libmcrypt-devel mhash mhash-devel mcrypt zip unzip ntpdate sqlite-devel sysstat patch bc expect expat-devel oniguruma oniguruma-devel libtirpc-devel nss libnsl rsync rsyslog git lsof lrzsz psmisc wget which libatomic tmux"
+  pkgList="deltarpm drpm gcc gcc-c++ make cmake autoconf libjpeg libjpeg-devel libjpeg-turbo libjpeg-turbo-devel libpng libpng-devel libxml2 libxml2-devel zlib zlib-devel libzip libzip-devel glibc glibc-devel krb5-devel libc-client libc-client-devel glib2 glib2-devel bzip2 bzip2-devel ncurses ncurses-devel libaio numactl numactl-libs readline-devel curl curl-devel e2fsprogs e2fsprogs-devel krb5-devel libidn libidn-devel openssl openssl-devel net-tools libxslt-devel libicu-devel libevent-devel libtool libtool-ltdl bison gd-devel vim-enhanced pcre-devel libmcrypt libmcrypt-devel mhash mhash-devel mcrypt zip unzip chrony ntpdate sqlite-devel sysstat patch bc expect expat-devel oniguruma oniguruma-devel libtirpc-devel nss libnsl rsync rsyslog git lsof lrzsz psmisc wget which libatomic tmux"
   for Package in ${pkgList}; do
     yum -y install ${Package}
   done
@@ -130,7 +127,7 @@ installDepsUbuntu() {
   apt-get -y upgrade -o Dir::Etc::SourceList=/tmp/security.sources.list
 
   # Install needed packages
-  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 net-tools 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 libnss3 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 net-tools 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 libnss3 rsync git lsof lrzsz chrony ntpdate psmisc wget sysv-rc apt-transport-https ca-certificates software-properties-common"
   export DEBIAN_FRONTEND=noninteractive
   for Package in ${pkgList}; do
     apt-get --no-install-recommends -y install ${Package}
@@ -139,11 +136,6 @@ installDepsUbuntu() {
 
 installDepsBySrc() {
   pushd ${oneinstack_dir}/src > /dev/null
-  if [ "${LikeOS}" == 'RHEL' ] && [ "${RHEL_ver}" == '6' ]; then
-    # upgrade autoconf for RHEL6
-    rpm -Uvh autoconf-2.69-12.2.noarch.rpm
-  fi
-
   if ! command -v icu-config > /dev/null 2>&1 || icu-config --version | grep '^3.' || [ "${Ubuntu_ver}" == "20" ]; then
     tar xzf icu4c-${icu4c_ver}-src.tgz
     pushd icu/source > /dev/null

include/init_RHEL.sh

@@ -98,11 +98,7 @@ net.netfilter.nf_conntrack_tcp_timeout_established = 3600
 EOF
 sysctl -p
 
-if [ "${RHEL_ver}" == '6' ]; then
-  sed -i 's@^ACTIVE_CONSOLES.*@ACTIVE_CONSOLES=/dev/tty[1-2]@' /etc/sysconfig/init
-  sed -i 's@^start@#start@' /etc/init/control-alt-delete.conf
-  sed -i 's@LANG=.*$@LANG="en_US.UTF-8"@g' /etc/sysconfig/i18n
-elif [ ${RHEL_ver} -ge 7 >/dev/null 2>&1 ]; then
+if [ ${RHEL_ver} -ge 7 >/dev/null 2>&1 ]; then
   sed -i 's@LANG=.*$@LANG="en_US.UTF-8"@g' /etc/locale.conf
 fi
 

include/init_Ubuntu.sh

@@ -90,12 +90,6 @@ LANG=en_US.UTF-8
 LANGUAGE=en_US:en
 EOF
 
-# Update time
-if [ -e "$(which ntpdate)" ]; then
-  ntpdate -u pool.ntp.org
-  [ ! -e "/var/spool/cron/crontabs/root" -o -z "$(grep ntpdate /var/spool/cron/crontabs/root 2>/dev/null)" ] && { echo "*/20 * * * * $(which ntpdate) -u pool.ntp.org > /dev/null 2>&1" >> /var/spool/cron/crontabs/root;chmod 600 /var/spool/cron/crontabs/root; }
-fi
-
 # iptables
 if [ "${iptables_flag}" == 'y' ]; then
   apt-get -y install debconf-utils

include/ioncube.sh

@@ -15,7 +15,7 @@ Install_ionCube() {
     PHP_main_ver=${PHP_detail_ver%.*}
     phpExtensionDir=`${php_install_dir}/bin/php-config --extension-dir`
     [ ! -d "${phpExtensionDir}" ] && mkdir -p ${phpExtensionDir}
-    [ -e "ioncube_loaders_lin_${SYS_BIT_d}.tar.gz" ] && tar xzf ioncube_loaders_lin_${SYS_BIT_d}.tar.gz
+    [ -e "ioncube_loaders_lin_${SYS_ARCH_i}.tar.gz" ] && tar xzf ioncube_loaders_lin_${SYS_ARCH_i}.tar.gz
     if [ -z "`echo ${phpExtensionDir} | grep 'non-zts'`" ]; then
       /bin/mv ioncube/ioncube_loader_lin_${PHP_main_ver}_ts.so ${phpExtensionDir}
       zend_extension="${phpExtensionDir}/ioncube_loader_lin_${PHP_main_ver}_ts.so"

include/jdk-1.6.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-# Author:  yeho <lj2007331 AT gmail.com>
-# BLOG:  https://linuxeye.com
-#
-# Notes: OneinStack for CentOS/RedHat 7+ Debian 8+ and Ubuntu 16+
-#
-# Project home page:
-#       https://oneinstack.com
-#       https://github.com/oneinstack/oneinstack
-
-Install_JDK16() {
-  pushd ${oneinstack_dir}/src > /dev/null
-  JDK_FILE="jdk-`echo ${jdk16_ver} | awk -F. '{print $2}'`u`echo ${jdk16_ver} | awk -F_ '{print $NF}'`-linux-${SYS_BIT_j}.bin"
-  JAVA_dir=/usr/java
-  JDK_NAME="jdk${jdk16_ver}"
-  JDK_PATH=${JAVA_dir}/${JDK_NAME}
-  [ "${PM}" == 'yum' ] && [ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`
-  chmod +x ${JDK_FILE}
-  ./${JDK_FILE}
-  [ ! -e ${JAVA_dir} ] && mkdir -p ${JAVA_dir}
-  /bin/cp -R ${JDK_NAME} ${JAVA_dir}
-  if [ -d "${JDK_PATH}" ]; then
-    chown -R ${run_user}:${run_group} ${JDK_PATH}
-    [ -z "`grep ^'export JAVA_HOME=' /etc/profile`" ] && { [ -z "`grep ^'export PATH=' /etc/profile`" ] && echo  "export JAVA_HOME=${JDK_PATH}" >> /etc/profile || sed -i "s@^export PATH=@export JAVA_HOME=${JDK_PATH}\nexport PATH=@" /etc/profile; } || sed -i "s@^export JAVA_HOME=.*@export JAVA_HOME=${JDK_PATH}@" /etc/profile
-    [ -z "`grep ^'export CLASSPATH=' /etc/profile`" ] && sed -i "s@export JAVA_HOME=\(.*\)@export JAVA_HOME=\1\nexport CLASSPATH=\$JAVA_HOME/lib/tools.jar:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib@" /etc/profile
-    [ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep '$JAVA_HOME/bin' /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=\$JAVA_HOME/bin:\1@" /etc/profile
-    [ -z "`grep ^'export PATH=' /etc/profile | grep '$JAVA_HOME/bin'`" ] && echo 'export PATH=$JAVA_HOME/bin:$PATH' >> /etc/profile
-    . /etc/profile
-    rm -rf ${JDK_NAME}
-    echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
-  else
-    echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}" && lsb_release -a
-    kill -9 $$; exit 1;
-  fi
-  popd
-}

include/jdk-1.7.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-# Author:  yeho <lj2007331 AT gmail.com>
-# BLOG:  https://linuxeye.com
-#
-# Notes: OneinStack for CentOS/RedHat 7+ Debian 8+ and Ubuntu 16+
-#
-# Project home page:
-#       https://oneinstack.com
-#       https://github.com/oneinstack/oneinstack
-
-Install_JDK17() {
-  pushd ${oneinstack_dir}/src > /dev/null
-  JDK_FILE="jdk-`echo ${jdk17_ver} | awk -F. '{print $2}'`u`echo ${jdk17_ver} | awk -F_ '{print $NF}'`-linux-${SYS_BIT_j}.tar.gz"
-  JAVA_dir=/usr/java
-  JDK_NAME="jdk${jdk17_ver}"
-  JDK_PATH=${JAVA_dir}/${JDK_NAME}
-  [ "${PM}" == 'yum' ] && [ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`
-  [ ! -e ${JAVA_dir} ] && mkdir -p ${JAVA_dir}
-  tar xzf ${JDK_FILE} -C ${JAVA_dir}
-  if [ -d "${JDK_PATH}" ]; then
-    chown -R ${run_user}:${run_group} ${JDK_PATH}
-    /bin/cp ${JDK_PATH}/jre/lib/security/cacerts /etc/ssl/certs/java
-    [ -z "`grep ^'export JAVA_HOME=' /etc/profile`" ] && { [ -z "`grep ^'export PATH=' /etc/profile`" ] && echo  "export JAVA_HOME=${JDK_PATH}" >> /etc/profile || sed -i "s@^export PATH=@export JAVA_HOME=${JDK_PATH}\nexport PATH=@" /etc/profile; } || sed -i "s@^export JAVA_HOME=.*@export JAVA_HOME=${JDK_PATH}@" /etc/profile
-    [ -z "`grep ^'export CLASSPATH=' /etc/profile`" ] && sed -i "s@export JAVA_HOME=\(.*\)@export JAVA_HOME=\1\nexport CLASSPATH=\$JAVA_HOME/lib/tools.jar:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib@" /etc/profile
-    [ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep '$JAVA_HOME/bin' /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=\$JAVA_HOME/bin:\1@" /etc/profile
-    [ -z "`grep ^'export PATH=' /etc/profile | grep '$JAVA_HOME/bin'`" ] && echo 'export PATH=$JAVA_HOME/bin:$PATH' >> /etc/profile
-    . /etc/profile
-    echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
-  else
-    rm -rf $JAVA_dir
-    echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}" && lsb_release -a
-    kill -9 $$; exit 1;
-  fi
-  popd
-}

include/jdk-1.8.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-# Author:  yeho <lj2007331 AT gmail.com>
-# BLOG:  https://linuxeye.com
-#
-# Notes: OneinStack for CentOS/RedHat 7+ Debian 8+ and Ubuntu 16+
-#
-# Project home page:
-#       https://oneinstack.com
-#       https://github.com/oneinstack/oneinstack
-
-Install_JDK18() {
-  pushd ${oneinstack_dir}/src > /dev/null
-  JDK_FILE="jdk-`echo ${jdk18_ver} | awk -F. '{print $2}'`u`echo ${jdk18_ver} | awk -F_ '{print $NF}'`-linux-${SYS_BIT_j}.tar.gz"
-  JAVA_dir=/usr/java
-  JDK_NAME="jdk${jdk18_ver}"
-  JDK_PATH=${JAVA_dir}/${JDK_NAME}
-  [ "${PM}" == 'yum' ] && [ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`
-  [ ! -e ${JAVA_dir} ] && mkdir -p ${JAVA_dir}
-  tar xzf ${JDK_FILE} -C ${JAVA_dir}
-  if [ -d "${JDK_PATH}" ]; then
-    chown -R ${run_user}:${run_group} ${JDK_PATH}
-    /bin/cp ${JDK_PATH}/jre/lib/security/cacerts /etc/ssl/certs/java
-    [ -z "`grep ^'export JAVA_HOME=' /etc/profile`" ] && { [ -z "`grep ^'export PATH=' /etc/profile`" ] && echo  "export JAVA_HOME=${JDK_PATH}" >> /etc/profile || sed -i "s@^export PATH=@export JAVA_HOME=${JDK_PATH}\nexport PATH=@" /etc/profile; } || sed -i "s@^export JAVA_HOME=.*@export JAVA_HOME=${JDK_PATH}@" /etc/profile
-    [ -z "`grep ^'export CLASSPATH=' /etc/profile`" ] && sed -i "s@export JAVA_HOME=\(.*\)@export JAVA_HOME=\1\nexport CLASSPATH=\$JAVA_HOME/lib/tools.jar:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib@" /etc/profile
-    [ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep '$JAVA_HOME/bin' /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=\$JAVA_HOME/bin:\1@" /etc/profile
-    [ -z "`grep ^'export PATH=' /etc/profile | grep '$JAVA_HOME/bin'`" ] && echo 'export PATH=$JAVA_HOME/bin:$PATH' >> /etc/profile
-    . /etc/profile
-    echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
-  else
-    echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}" && lsb_release -a
-    kill -9 $$; exit 1;
-  fi
-  popd
-}

include/jdk-11.0.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-# Author:  yeho <lj2007331 AT gmail.com>
-# BLOG:  https://linuxeye.com
-#
-# Notes: OneinStack for CentOS/RedHat 7+ Debian 8+ and Ubuntu 16+
-#
-# Project home page:
-#       https://oneinstack.com
-#       https://github.com/oneinstack/oneinstack
-
-Install_JDK110() {
-  pushd ${oneinstack_dir}/src > /dev/null
-  JDK_FILE="jdk-${jdk110_ver}_linux-${SYS_BIT_j}_bin.tar.gz"
-  JAVA_dir=/usr/java
-  JDK_NAME="jdk-${jdk110_ver}"
-  JDK_PATH=${JAVA_dir}/${JDK_NAME}
-  [ "${PM}" == 'yum' ] && [ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`
-  [ ! -e ${JAVA_dir} ] && mkdir -p ${JAVA_dir}
-  tar xzf ${JDK_FILE} -C ${JAVA_dir}
-  if [ -d "${JDK_PATH}" ]; then
-    chown -R ${run_user}:${run_group} ${JDK_PATH}
-    /bin/cp ${JDK_PATH}/jre/lib/security/cacerts /etc/ssl/certs/java
-    [ -z "`grep ^'export JAVA_HOME=' /etc/profile`" ] && { [ -z "`grep ^'export PATH=' /etc/profile`" ] && echo  "export JAVA_HOME=${JDK_PATH}" >> /etc/profile || sed -i "s@^export PATH=@export JAVA_HOME=${JDK_PATH}\nexport PATH=@" /etc/profile; } || sed -i "s@^export JAVA_HOME=.*@export JAVA_HOME=${JDK_PATH}@" /etc/profile
-    [ -z "`grep ^'export CLASSPATH=' /etc/profile`" ] && sed -i "s@export JAVA_HOME=\(.*\)@export JAVA_HOME=\1\nexport CLASSPATH=\$JAVA_HOME/lib/tools.jar:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib@" /etc/profile
-    [ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep '$JAVA_HOME/bin' /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=\$JAVA_HOME/bin:\1@" /etc/profile
-    [ -z "`grep ^'export PATH=' /etc/profile | grep '$JAVA_HOME/bin'`" ] && echo 'export PATH=$JAVA_HOME/bin:$PATH' >> /etc/profile
-    . /etc/profile
-    echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
-  else
-    echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}" && lsb_release -a
-    kill -9 $$; exit 1;
-  fi
-  popd
-}

include/jemalloc.sh

@@ -17,7 +17,7 @@ Install_Jemalloc() {
     make -j ${THREAD} && make install
     popd > /dev/null
     if [ -f "/usr/local/lib/libjemalloc.so" ]; then
-      if [ "${OS_BIT}" == '64' -a "${LikeOS}" == 'RHEL' ]; then
+      if [ "${LikeOS}" == 'RHEL' ]; then
         ln -s /usr/local/lib/libjemalloc.so.2 /usr/lib64/libjemalloc.so.1
       else
         ln -s /usr/local/lib/libjemalloc.so.2 /usr/lib/libjemalloc.so.1

include/mariadb-10.4.sh

@@ -17,8 +17,8 @@ Install_MariaDB104() {
   mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar zxf mariadb-${mariadb104_ver}-linux-systemd-${SYS_BIT_b}.tar.gz
-    mv mariadb-${mariadb104_ver}-linux-systemd-${SYS_BIT_b}/* ${mariadb_install_dir}
+    tar zxf mariadb-${mariadb104_ver}-linux-systemd-x86_64.tar.gz
+    mv mariadb-${mariadb104_ver}-linux-systemd-x86_64/* ${mariadb_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
@@ -52,7 +52,7 @@ Install_MariaDB104() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf mariadb-${mariadb104_ver}-linux-systemd-${SYS_BIT_b}
+      rm -rf mariadb-${mariadb104_ver}-linux-systemd-x86_64
     elif [ "${dbinstallmethod}" == "2" ]; then
       rm -rf mariadb-${mariadb104_ver} boost_${boostVersion2}
     fi

include/mariadb-10.5.sh

@@ -17,8 +17,8 @@ Install_MariaDB105() {
   mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar zxf mariadb-${mariadb105_ver}-linux-systemd-${SYS_BIT_b}.tar.gz
-    mv mariadb-${mariadb105_ver}-linux-systemd-${SYS_BIT_b}/* ${mariadb_install_dir}
+    tar zxf mariadb-${mariadb105_ver}-linux-systemd-x86_64.tar.gz
+    mv mariadb-${mariadb105_ver}-linux-systemd-x86_64/* ${mariadb_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
@@ -52,7 +52,7 @@ Install_MariaDB105() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf mariadb-${mariadb105_ver}-linux-systemd-${SYS_BIT_b}
+      rm -rf mariadb-${mariadb105_ver}-linux-systemd-x86_64
     elif [ "${dbinstallmethod}" == "2" ]; then
       rm -rf mariadb-${mariadb105_ver} boost_${boostVersion2}
     fi

include/mariadb-10.6.sh

@@ -17,8 +17,8 @@ Install_MariaDB106() {
   mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar zxf mariadb-${mariadb106_ver}-linux-systemd-${SYS_BIT_b}.tar.gz
-    mv mariadb-${mariadb106_ver}-linux-systemd-${SYS_BIT_b}/* ${mariadb_install_dir}
+    tar zxf mariadb-${mariadb106_ver}-linux-systemd-x86_64.tar.gz
+    mv mariadb-${mariadb106_ver}-linux-systemd-x86_64/* ${mariadb_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
@@ -52,7 +52,7 @@ Install_MariaDB106() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf mariadb-${mariadb106_ver}-linux-systemd-${SYS_BIT_b}
+      rm -rf mariadb-${mariadb106_ver}-linux-systemd-x86_64
     elif [ "${dbinstallmethod}" == "2" ]; then
       rm -rf mariadb-${mariadb106_ver} boost_${boostVersion2}
     fi

include/mariadb-5.5.sh

@@ -17,8 +17,8 @@ Install_MariaDB55() {
   mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar zxf mariadb-${mariadb55_ver}-linux-systemd-${SYS_BIT_b}.tar.gz
-    mv mariadb-${mariadb55_ver}-linux-systemd-${SYS_BIT_b}/* ${mariadb_install_dir}
+    tar zxf mariadb-${mariadb55_ver}-linux-systemd-x86_64.tar.gz
+    mv mariadb-${mariadb55_ver}-linux-systemd-x86_64/* ${mariadb_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
@@ -50,7 +50,7 @@ Install_MariaDB55() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf mariadb-${mariadb55_ver}-linux-systemd-${SYS_BIT_b}
+      rm -rf mariadb-${mariadb55_ver}-linux-systemd-x86_64
     elif [ "${dbinstallmethod}" == "2" ]; then
       rm -rf mariadb-${mariadb55_ver}
     fi

include/mongodb.sh

@@ -13,8 +13,8 @@ Install_MongoDB() {
   id -u mongod >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -s /sbin/nologin mongod
   mkdir -p ${mongo_data_dir};chown mongod.mongod -R ${mongo_data_dir}
-  tar xzf mongodb-linux-${SYS_BIT_b}-${mongodb_ver}.tgz
-  /bin/mv mongodb-linux-${SYS_BIT_b}-${mongodb_ver} ${mongo_install_dir}
+  tar xzf mongodb-linux-x86_64-${mongodb_ver}.tgz
+  /bin/mv mongodb-linux-x86_64-${mongodb_ver} ${mongo_install_dir}
   if [ -e /bin/systemctl ]; then
     /bin/cp ${oneinstack_dir}/init.d/mongod.service /lib/systemd/system/
     sed -i "s@=/usr/local/mongodb@=${mongo_install_dir}@g" /lib/systemd/system/mongod.service
@@ -71,7 +71,7 @@ EOF
   if [ -e "${mongo_install_dir}/bin/mongo" ]; then
     sed -i "s+^dbmongopwd.*+dbmongopwd='$dbmongopwd'+" ../options.conf
     echo "${CSUCCESS}MongoDB installed successfully! ${CEND}"
-    rm -rf mongodb-linux-${SYS_BIT_b}-${mongodb_ver}
+    rm -rf mongodb-linux-x86_64-${mongodb_ver}
   else
     rm -rf ${mongo_install_dir} ${mongo_data_dir}
     echo "${CFAILURE}MongoDB install failed, Please contact the author! ${CEND}" && lsb_release -a

include/mysql-5.5.sh

@@ -17,8 +17,8 @@ Install_MySQL55() {
   mkdir -p ${mysql_data_dir};chown mysql.mysql -R ${mysql_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar xzf mysql-${mysql55_ver}-linux-glibc2.12-${SYS_BIT_b}.tar.gz
-    mv mysql-${mysql55_ver}-linux-glibc2.12-${SYS_BIT_b}/* ${mysql_install_dir}
+    tar xzf mysql-${mysql55_ver}-linux-glibc2.12-x86_64.tar.gz
+    mv mysql-${mysql55_ver}-linux-glibc2.12-x86_64/* ${mysql_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mysql_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mysql_install_dir}@g" ${mysql_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
@@ -50,7 +50,7 @@ Install_MySQL55() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}MySQL installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf mysql-${mysql55_ver}-*-${SYS_BIT_b}
+      rm -rf mysql-${mysql55_ver}-*-x86_64
     elif [ "${dbinstallmethod}" == "2" ]; then
       rm -rf mysql-${mysql55_ver}
     fi

include/mysql-5.6.sh

@@ -17,8 +17,8 @@ Install_MySQL56() {
   mkdir -p ${mysql_data_dir};chown mysql.mysql -R ${mysql_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar xzf mysql-${mysql56_ver}-linux-glibc2.12-${SYS_BIT_b}.tar.gz
-    mv mysql-${mysql56_ver}-linux-glibc2.12-${SYS_BIT_b}/* ${mysql_install_dir}
+    tar xzf mysql-${mysql56_ver}-linux-glibc2.12-x86_64.tar.gz
+    mv mysql-${mysql56_ver}-linux-glibc2.12-x86_64/* ${mysql_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mysql_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mysql_install_dir}@g" ${mysql_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
@@ -48,7 +48,7 @@ Install_MySQL56() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}MySQL installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf mysql-${mysql56_ver}-*-${SYS_BIT_b}
+      rm -rf mysql-${mysql56_ver}-*-x86_64
     elif [ "${dbinstallmethod}" == "2" ]; then
       rm -rf mysql-${mysql56_ver}
     fi

include/mysql-5.7.sh

@@ -17,8 +17,8 @@ Install_MySQL57() {
   mkdir -p ${mysql_data_dir};chown mysql.mysql -R ${mysql_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar xzf mysql-${mysql57_ver}-linux-glibc2.12-${SYS_BIT_b}.tar.gz
-    mv mysql-${mysql57_ver}-linux-glibc2.12-${SYS_BIT_b}/* ${mysql_install_dir}
+    tar xzf mysql-${mysql57_ver}-linux-glibc2.12-x86_64.tar.gz
+    mv mysql-${mysql57_ver}-linux-glibc2.12-x86_64/* ${mysql_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mysql_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mysql_install_dir}@g" ${mysql_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
@@ -52,7 +52,7 @@ Install_MySQL57() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}MySQL installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf mysql-${mysql57_ver}-*-${SYS_BIT_b}
+      rm -rf mysql-${mysql57_ver}-*-x86_64
     elif [ "${dbinstallmethod}" == "2" ]; then
       rm -rf mysql-${mysql57_ver} boost_${boostVersion2}
     fi

include/mysql-8.0.sh

@@ -17,8 +17,8 @@ Install_MySQL80() {
   mkdir -p ${mysql_data_dir};chown mysql.mysql -R ${mysql_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar xJf mysql-${mysql80_ver}-linux-glibc2.12-${SYS_BIT_b}.tar.xz
-    mv mysql-${mysql80_ver}-linux-glibc2.12-${SYS_BIT_b}/* ${mysql_install_dir}
+    tar xJf mysql-${mysql80_ver}-linux-glibc2.12-x86_64.tar.xz
+    mv mysql-${mysql80_ver}-linux-glibc2.12-x86_64/* ${mysql_install_dir}
     sed -i "s@/usr/local/mysql@${mysql_install_dir}@g" ${mysql_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
     boostVersion2=$(echo ${boost_ver} | awk -F. '{print $1"_"$2"_"$3}')
@@ -55,7 +55,7 @@ Install_MySQL80() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}MySQL installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf mysql-${mysql80_ver}-*-${SYS_BIT_b}
+      rm -rf mysql-${mysql80_ver}-*-x86_64
     elif [ "${dbinstallmethod}" == "2" ]; then
       rm -rf mysql-${mysql80_ver} boost_${boostVersion2}
     fi

include/nodejs.sh

@@ -10,8 +10,8 @@
 
 Install_Nodejs() {
   pushd ${oneinstack_dir}/src > /dev/null
-  tar xzf node-v${nodejs_ver}-linux-${SYS_BIT_n}.tar.gz
-  /bin/mv node-v${nodejs_ver}-linux-${SYS_BIT_n} ${nodejs_install_dir}
+  tar xzf node-v${nodejs_ver}-linux-${SYS_ARCH_n}.tar.gz
+  /bin/mv node-v${nodejs_ver}-linux-${SYS_ARCH_n} ${nodejs_install_dir}
   if [ -e "${nodejs_install_dir}/bin/node" ]; then
     cat > /etc/profile.d/nodejs.sh << EOF
 export NODE_HOME=${nodejs_install_dir}

include/openjdk-11.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+# Author:  yeho <lj2007331 AT gmail.com>
+# BLOG:  https://linuxeye.com
+#
+# Notes: OneinStack for CentOS/RedHat 7+ Debian 8+ and Ubuntu 16+
+#
+# Project home page:
+#       https://oneinstack.com
+#       https://github.com/oneinstack/oneinstack
+
+Install_OpenJDK11() {
+  if [ "${LikeOS}" == 'RHEL' ]; then
+    yum -y install java-11-openjdk-devel
+    JAVA_HOME=/usr/lib/jvm/java-11-openjdk
+  elif [ "${LikeOS}" == 'Debian' ]; then
+    if [[ "${Debian_ver}" =~ ^8$ ]]; then
+      #wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
+      cat ${oneinstack_dir}/src/adoptopenjdk.key | sudo apt-key add -
+      apt-add-repository --yes https://mirrors.tuna.tsinghua.edu.cn/AdoptOpenJDK/deb
+      apt -y update
+      apt-get --no-install-recommends -y install adoptopenjdk-11-hotspot
+      JAVA_HOME=/usr/lib/jvm/adoptopenjdk-11-hotspot-${SYS_ARCH}
+    else
+      apt-get --no-install-recommends -y install openjdk-11-jdk
+      JAVA_HOME=/usr/lib/jvm/java-11-openjdk-${SYS_ARCH}
+    fi
+  elif [ "${LikeOS}" == 'Ubuntu' ]; then
+    if [[ "${Ubuntu_ver}" =~ ^16$ ]]; then
+      cat ${oneinstack_dir}/src/adoptopenjdk.key | sudo apt-key add -
+      apt-add-repository --yes https://mirrors.tuna.tsinghua.edu.cn/AdoptOpenJDK/deb
+      apt -y update
+      apt-get --no-install-recommends -y install adoptopenjdk-11-hotspot
+      JAVA_HOME=/usr/lib/jvm/adoptopenjdk-11-hotspot-${SYS_ARCH}
+    else
+      apt-get --no-install-recommends -y install openjdk-11-jdk
+      JAVA_HOME=/usr/lib/jvm/java-11-openjdk-${SYS_ARCH}
+    fi
+  fi
+  if [ -e "${JAVA_HOME}/bin/java" ]; then
+    cat > /etc/profile.d/openjdk.sh << EOF
+export JAVA_HOME=${JAVA_HOME}
+export CLASSPATH=\$JAVA_HOME/lib/tools.jar:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib
+EOF
+    . /etc/profile.d/openjdk.sh
+    echo "${CSUCCESS}OpenJDK11 installed successfully! ${CEND}"
+  else
+    echo "${CFAILURE}OpenJDK11 install failed, Please contact the author! ${CEND}" && lsb_release -a
+    kill -9 $$; exit 1;
+  fi
+}

include/openjdk-8.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+# Author:  yeho <lj2007331 AT gmail.com>
+# BLOG:  https://linuxeye.com
+#
+# Notes: OneinStack for CentOS/RedHat 7+ Debian 8+ and Ubuntu 16+
+#
+# Project home page:
+#       https://oneinstack.com
+#       https://github.com/oneinstack/oneinstack
+
+Install_OpenJDK8() {
+  if [ "${LikeOS}" == 'RHEL' ]; then
+    yum -y install java-1.8.0-openjdk-devel
+    JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk
+  elif [ "${LikeOS}" == 'Debian' ]; then
+    if [[ "${Debian_ver}" =~ ^8$|^10$|^11$ ]]; then
+      #wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
+      cat ${oneinstack_dir}/src/adoptopenjdk.key | sudo apt-key add -
+      apt-add-repository --yes https://mirrors.tuna.tsinghua.edu.cn/AdoptOpenJDK/deb
+      apt -y update
+      apt-get --no-install-recommends -y install adoptopenjdk-8-hotspot
+      JAVA_HOME=/usr/lib/jvm/adoptopenjdk-8-hotspot-${SYS_ARCH}
+    elif [[ "${Debian_ver}" =~ ^9$ ]]; then
+      apt-get --no-install-recommends -y install openjdk-8-jdk
+      JAVA_HOME=/usr/lib/jvm/java-8-openjdk-${SYS_ARCH}
+    fi
+  elif [ "${LikeOS}" == 'Ubuntu' ]; then
+    apt-get --no-install-recommends -y install openjdk-8-jdk
+    JAVA_HOME=/usr/lib/jvm/java-8-openjdk-${SYS_ARCH}
+  fi
+  if [ -e "${JAVA_HOME}/bin/java" ]; then
+    cat > /etc/profile.d/openjdk.sh << EOF
+export JAVA_HOME=${JAVA_HOME}
+export CLASSPATH=\$JAVA_HOME/lib/tools.jar:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib
+EOF
+    . /etc/profile.d/openjdk.sh
+    echo "${CSUCCESS}OpenJDK8 installed successfully! ${CEND}"
+  else
+    echo "${CFAILURE}OpenJDK8 install failed, Please contact the author! ${CEND}" && lsb_release -a
+    kill -9 $$; exit 1;
+  fi
+}

include/pecl_imap.sh

@@ -13,7 +13,7 @@ Install_pecl_imap() {
     pushd ${oneinstack_dir}/src > /dev/null
     if [ "${PM}" == 'yum' ]; then
       yum -y install libc-client-devel
-      [ "${OS_BIT}" == '64' -a ! -e /usr/lib/libc-client.so ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
+      [ ! -e /usr/lib/libc-client.so ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
     else
       apt-get -y install libc-client2007e-dev
     fi

include/pecl_ldap.sh

@@ -18,14 +18,13 @@ Install_pecl_ldap() {
     pushd php-${PHP_detail_ver}/ext/ldap > /dev/null
     if [ "${PM}" == 'yum' ]; then
       yum -y install openldap-devel
-      [ "${OS_BIT}" == '64' ] && With_libdir='--with-libdir=lib64'
     else
       apt-get -y install libldap2-dev
-      ln -s /usr/lib/${SYS_BIT_c}-linux-gnu/libldap.so /usr/lib/
-      ln -s /usr/lib/${SYS_BIT_c}-linux-gnu/liblber.so /usr/lib/
+      ln -s /usr/lib/${ARCH}-linux-gnu/libldap.so /usr/lib/
+      ln -s /usr/lib/${ARCH}-linux-gnu/liblber.so /usr/lib/
     fi
     ${php_install_dir}/bin/phpize
-    ./configure --with-php-config=${php_install_dir}/bin/php-config --with-ldap ${With_libdir}
+    ./configure --with-php-config=${php_install_dir}/bin/php-config --with-ldap --with-libdir=lib64
     make -j ${THREAD} && make install
     popd > /dev/null
     if [ -f "${phpExtensionDir}/ldap.so" ]; then

include/pecl_phalcon.sh

@@ -28,7 +28,7 @@ Install_pecl_phalcon() {
       tar xzf cphalcon-${phalcon_oldver}.tar.gz
       pushd cphalcon-${phalcon_oldver}/build > /dev/null
       echo "${CMSG}It may take a few minutes... ${CEND}"
-      ./install --phpize ${php_install_dir}/bin/phpize --php-config ${php_install_dir}/bin/php-config --arch ${OS_BIT}bits
+      ./install --phpize ${php_install_dir}/bin/phpize --php-config ${php_install_dir}/bin/php-config --arch 64bits
       popd > /dev/null
     else
       echo "${CWARNING}Your php ${PHP_detail_ver} does not support phalcon! ${CEND}"

include/percona-5.5.sh

@@ -18,10 +18,10 @@ Install_Percona55() {
 
   if [ "${dbinstallmethod}" == "1" ]; then
     perconaVerStr1=$(echo ${percona55_ver} | sed "s@-@-rel@")
-    tar xzf ./Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
-    mv Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}/* ${percona_install_dir}
+    tar xzf ./Percona-Server-${perconaVerStr1}-Linux.x86_64.${sslLibVer}.tar.gz
+    mv Percona-Server-${perconaVerStr1}-Linux.x86_64.${sslLibVer}/* ${percona_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${percona_install_dir}/bin/mysqld_safe
-    sed -i "s@/usr/local/Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
+    sed -i "s@/usr/local/Percona-Server-${perconaVerStr1}-Linux.x86_64.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
     tar xzf percona-server-${percona55_ver}.tar.gz
     pushd percona-server-${percona55_ver}
@@ -51,7 +51,7 @@ Install_Percona55() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}Percona installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}
+      rm -rf Percona-Server-${perconaVerStr1}-Linux.x86_64.${sslLibVer}
     elif [ "${dbinstallmethod}" == "2" ]; then
     rm -rf percona-server-${percona55_ver}
     fi

include/percona-5.6.sh

@@ -18,10 +18,10 @@ Install_Percona56() {
 
   if [ "${dbinstallmethod}" == "1" ]; then
     perconaVerStr1=$(echo ${percona56_ver} | sed "s@-@-rel@")
-    tar xzf ./Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
-    mv Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}/* ${percona_install_dir}
+    tar xzf ./Percona-Server-${perconaVerStr1}-Linux.x86_64.${sslLibVer}.tar.gz
+    mv Percona-Server-${perconaVerStr1}-Linux.x86_64.${sslLibVer}/* ${percona_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${percona_install_dir}/bin/mysqld_safe
-    sed -i "s@/usr/local/Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
+    sed -i "s@/usr/local/Percona-Server-${perconaVerStr1}-Linux.x86_64.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
     tar xzf percona-server-${percona56_ver}.tar.gz
     pushd percona-server-${percona56_ver}
@@ -50,7 +50,7 @@ Install_Percona56() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}Percona installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}
+      rm -rf Percona-Server-${perconaVerStr1}-Linux.x86_64.${sslLibVer}
     elif [ "${dbinstallmethod}" == "2" ]; then
       rm -rf percona-server-${percona56_ver}
     fi

include/percona-5.7.sh

@@ -17,10 +17,10 @@ Install_Percona57() {
   mkdir -p ${percona_data_dir};chown mysql.mysql -R ${percona_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar xzf Percona-Server-${percona57_ver}-Linux.${SYS_BIT_b}.glibc2.12.tar.gz
-    mv Percona-Server-${percona57_ver}-Linux.${SYS_BIT_b}.glibc2.12/* ${percona_install_dir}
+    tar xzf Percona-Server-${percona57_ver}-Linux.x86_64.glibc2.12.tar.gz
+    mv Percona-Server-${percona57_ver}-Linux.x86_64.glibc2.12/* ${percona_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${percona_install_dir}/bin/mysqld_safe
-    sed -i "s@Percona-Server-${percona57_ver}-Linux.${SYS_BIT_b}.glibc2.12@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
+    sed -i "s@Percona-Server-${percona57_ver}-Linux.x86_64.glibc2.12@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
     boostVersion2=$(echo ${boost_oldver} | awk -F. '{print $1"_"$2"_"$3}')
     tar xzf boost_${boostVersion2}.tar.gz
@@ -54,7 +54,7 @@ Install_Percona57() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}Percona installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf Percona-Server-${percona57_ver}-Linux.${SYS_BIT_b}.${sslLibVer}
+      rm -rf Percona-Server-${percona57_ver}-Linux.x86_64.${sslLibVer}
     elif [ "${dbinstallmethod}" == "2" ]; then
       rm -rf percona-server-${percona57_ver} boost_${boostVersion2}
     fi

include/percona-8.0.sh

@@ -17,19 +17,11 @@ Install_Percona80() {
   mkdir -p ${percona_data_dir};chown mysql.mysql -R ${percona_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar xzf ./Percona-Server-${percona80_ver}-Linux.${SYS_BIT_b}.glibc2.17.tar.gz
-    mv Percona-Server-${percona80_ver}-Linux.${SYS_BIT_b}.glibc2.17/* ${percona_install_dir}
+    tar xzf ./Percona-Server-${percona80_ver}-Linux.x86_64.glibc2.17.tar.gz
+    mv Percona-Server-${percona80_ver}-Linux.x86_64.glibc2.17/* ${percona_install_dir}
     #sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${percona_install_dir}/bin/mysqld_safe
-    sed -i "s@/usr/local/Percona-Server-${percona80_ver}-Linux.${SYS_BIT_b}.glibc2.17@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
+    sed -i "s@/usr/local/Percona-Server-${percona80_ver}-Linux.x86_64.glibc2.17@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
-    if [ "${PM}" == 'yum' ]; then
-      yum -y install openldap-devel
-      [ "${OS_BIT}" == '64' ] && With_libdir='--with-libdir=lib64'
-    else
-      apt-get -y install libldap2-dev
-      ln -s /usr/lib/${SYS_BIT_c}-linux-gnu/libldap.so /usr/lib/
-      ln -s /usr/lib/${SYS_BIT_c}-linux-gnu/liblber.so /usr/lib/
-    fi
     boostVersion2=$(echo ${boost_percona_ver} | awk -F. '{print $1"_"$2"_"$3}')
     tar xzf boost_${boostVersion2}.tar.gz
     tar xzf percona-server-${percona80_ver}.tar.gz
@@ -64,7 +56,7 @@ Install_Percona80() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}Percona installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf Percona-Server-${percona80_ver}-Linux.${SYS_BIT_b}.glibc2.12
+      rm -rf Percona-Server-${percona80_ver}-Linux.x86_64.glibc2.12
     elif [ "${dbinstallmethod}" == "2" ]; then
       rm -rf percona-server-${percona80_ver} boost_${boostVersion2}
     fi

include/php-5.3.sh

@@ -73,12 +73,8 @@ Install_PHP53() {
 
   if [ "${PM}" == 'yum' ]; then
     [ ! -e "/usr/bin/libmcrypt-config" ] && ln -s /usr/local/bin/libmcrypt-config /usr/bin/libmcrypt-config
-    if [ "${OS_BIT}" == '64' ]; then
-      [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
-      [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
-    else
-      [ ! -e "/lib/libpcre.so.1" ] && ln -s /lib/libpcre.so.0.0.1 /lib/libpcre.so.1
-    fi
+    [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
+    [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
   fi
 
   if [ ! -e "/usr/local/bin/mcrypt" -a ! -e "/usr/bin/mcrypt" ]; then

include/php-5.4.sh

@@ -73,12 +73,8 @@ Install_PHP54() {
 
   if [ "${PM}" == 'yum' ]; then
     [ ! -e "/usr/bin/libmcrypt-config" ] && ln -s /usr/local/bin/libmcrypt-config /usr/bin/libmcrypt-config
-    if [ "${OS_BIT}" == '64' ]; then
-      [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
-      [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
-    else
-      [ ! -e "/lib/libpcre.so.1" ] && ln -s /lib/libpcre.so.0.0.1 /lib/libpcre.so.1
-    fi
+    [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
+    [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
   fi
 
   if [ ! -e "/usr/local/bin/mcrypt" -a ! -e "/usr/bin/mcrypt" ]; then

include/php-5.5.sh

@@ -73,12 +73,8 @@ Install_PHP55() {
 
   if [ "${PM}" == 'yum' ]; then
     [ ! -e "/usr/bin/libmcrypt-config" ] && ln -s /usr/local/bin/libmcrypt-config /usr/bin/libmcrypt-config
-    if [ "${OS_BIT}" == '64' ]; then
-      [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
-      [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
-    else
-      [ ! -e "/lib/libpcre.so.1" ] && ln -s /lib/libpcre.so.0.0.1 /lib/libpcre.so.1
-    fi
+    [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
+    [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
   fi
 
   if [ ! -e "/usr/local/bin/mcrypt" -a ! -e "/usr/bin/mcrypt" ]; then

include/php-5.6.sh

@@ -73,12 +73,8 @@ Install_PHP56() {
 
   if [ "${PM}" == 'yum' ]; then
     [ ! -e "/usr/bin/libmcrypt-config" ] && ln -s /usr/local/bin/libmcrypt-config /usr/bin/libmcrypt-config
-    if [ "${OS_BIT}" == '64' ]; then
-      [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
-      [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
-    else
-      [ ! -e "/lib/libpcre.so.1" ] && ln -s /lib/libpcre.so.0.0.1 /lib/libpcre.so.1
-    fi
+    [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
+    [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
   fi
 
   if [ ! -e "/usr/local/bin/mcrypt" -a ! -e "/usr/bin/mcrypt" ]; then

include/php-7.0.sh

@@ -73,12 +73,8 @@ Install_PHP70() {
 
   if [ "${PM}" == 'yum' ]; then
     [ ! -e "/usr/bin/libmcrypt-config" ] && ln -s /usr/local/bin/libmcrypt-config /usr/bin/libmcrypt-config
-    if [ "${OS_BIT}" == '64' ]; then
-      [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
-      [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
-    else
-      [ ! -e "/lib/libpcre.so.1" ] && ln -s /lib/libpcre.so.0.0.1 /lib/libpcre.so.1
-    fi
+    [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
+    [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
   fi
 
   if [ ! -e "/usr/local/bin/mcrypt" -a ! -e "/usr/bin/mcrypt" ]; then

include/php-7.1.sh

@@ -73,12 +73,8 @@ Install_PHP71() {
 
   if [ "${PM}" == 'yum' ]; then
     [ ! -e "/usr/bin/libmcrypt-config" ] && ln -s /usr/local/bin/libmcrypt-config /usr/bin/libmcrypt-config
-    if [ "${OS_BIT}" == '64' ]; then
-      [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
-      [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
-    else
-      [ ! -e "/lib/libpcre.so.1" ] && ln -s /lib/libpcre.so.0.0.1 /lib/libpcre.so.1
-    fi
+    [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
+    [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
   fi
 
   if [ ! -e "/usr/local/bin/mcrypt" -a ! -e "/usr/bin/mcrypt" ]; then

include/php-7.2.sh

@@ -77,12 +77,8 @@ Install_PHP72() {
   ldconfig
 
   if [ "${PM}" == 'yum' ]; then
-    if [ "${OS_BIT}" == '64' ]; then
-      [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
-      [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
-    else
-      [ ! -e "/lib/libpcre.so.1" ] && ln -s /lib/libpcre.so.0.0.1 /lib/libpcre.so.1
-    fi
+    [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
+    [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
   fi
 
   id -g ${run_group} >/dev/null 2>&1

include/php-7.3.sh

@@ -77,12 +77,8 @@ Install_PHP73() {
   ldconfig
 
   if [ "${PM}" == 'yum' ]; then
-    if [ "${OS_BIT}" == '64' ]; then
-      [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
-      [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
-    else
-      [ ! -e "/lib/libpcre.so.1" ] && ln -s /lib/libpcre.so.0.0.1 /lib/libpcre.so.1
-    fi
+    [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
+    [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
   fi
 
   id -g ${run_group} >/dev/null 2>&1

include/php-7.4.sh

@@ -86,12 +86,8 @@ Install_PHP74() {
   ldconfig
 
   if [ "${PM}" == 'yum' ]; then
-    if [ "${OS_BIT}" == '64' ]; then
-      [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
-      [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
-    else
-      [ ! -e "/lib/libpcre.so.1" ] && ln -s /lib/libpcre.so.0.0.1 /lib/libpcre.so.1
-    fi
+    [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
+    [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
   fi
 
   id -g ${run_group} >/dev/null 2>&1

include/php-8.0.sh

@@ -86,12 +86,8 @@ Install_PHP80() {
   ldconfig
 
   if [ "${PM}" == 'yum' ]; then
-    if [ "${OS_BIT}" == '64' ]; then
-      [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
-      [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
-    else
-      [ ! -e "/lib/libpcre.so.1" ] && ln -s /lib/libpcre.so.0.0.1 /lib/libpcre.so.1
-    fi
+    [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
+    [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
   fi
 
   id -g ${run_group} >/dev/null 2>&1

include/php-8.1.sh

@@ -86,12 +86,8 @@ Install_PHP81() {
   ldconfig
 
   if [ "${PM}" == 'yum' ]; then
-    if [ "${OS_BIT}" == '64' ]; then
-      [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
-      [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
-    else
-      [ ! -e "/lib/libpcre.so.1" ] && ln -s /lib/libpcre.so.0.0.1 /lib/libpcre.so.1
-    fi
+    [ ! -e "/lib64/libpcre.so.1" ] && ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
+    [ ! -e "/usr/lib/libc-client.so" ] && ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
   fi
 
   id -g ${run_group} >/dev/null 2>&1

include/redis.sh

@@ -12,10 +12,6 @@ Install_redis_server() {
   pushd ${oneinstack_dir}/src > /dev/null
   tar xzf redis-${redis_ver}.tar.gz
   pushd redis-${redis_ver} > /dev/null
-  if [ "${OS_BIT}" == '32' -a "${armplatform}" != 'y' ]; then
-    sed -i '1i\CFLAGS= -march=i686' src/Makefile
-    sed -i 's@^OPT=.*@OPT=-O2 -march=i686@' src/.make-settings
-  fi
   make -j ${THREAD}
   if [ -f "src/redis-server" ]; then
     mkdir -p ${redis_install_dir}/{bin,etc,var}

include/sourceguardian.sh

@@ -15,7 +15,7 @@ Install_SourceGuardian() {
     PHP_main_ver=${PHP_detail_ver%.*}
     phpExtensionDir=`${php_install_dir}/bin/php-config --extension-dir`
     [ ! -e sourceguardian ] && mkdir sourceguardian
-    [ -e "loaders.linux-${SYS_BIT_c}.tar.gz" ] && tar xzf loaders.linux-${SYS_BIT_c}.tar.gz -C sourceguardian
+    [ -e "loaders.linux-${ARCH}.tar.gz" ] && tar xzf loaders.linux-${ARCH}.tar.gz -C sourceguardian
   
     if [ -e "sourceguardian/ixed.${PHP_main_ver}.lin" ]; then
       [ ! -d "${phpExtensionDir}" ] && mkdir -p ${phpExtensionDir}

include/upgrade_db.sh

@@ -59,8 +59,8 @@ Upgrade_DB() {
     [ "${db_flag}" != 'y' ] && read -e -p "Please input upgrade ${DB} Version(example: ${OLD_db_ver}): " NEW_db_ver
     if [ `echo ${NEW_db_ver} | awk -F. '{print $1"."$2}'` == `echo ${OLD_db_ver} | awk -F. '{print $1"."$2}'` ]; then
       if [ "${DB}" == 'MariaDB' ]; then
-        DB_filename=mariadb-${NEW_db_ver}-linux-systemd-${SYS_BIT_b}
-        DB_URL=${DOWN_ADDR}/mariadb-${NEW_db_ver}/bintar-linux-systemd-${SYS_BIT_a}/${DB_filename}.tar.gz
+        DB_filename=mariadb-${NEW_db_ver}-linux-systemd-x86_64
+        DB_URL=${DOWN_ADDR}/mariadb-${NEW_db_ver}/bintar-linux-systemd-x86_64/${DB_filename}.tar.gz
       elif [ "${DB}" == 'Percona' ]; then
         if [[ "`echo ${NEW_db_ver} | awk -F. '{print $1"."$2}'`" =~ ^5.[5-6]$ ]]; then
           perconaVerStr1=$(echo ${NEW_db_ver} | sed "s@-@-rel@")
@@ -68,13 +68,13 @@ Upgrade_DB() {
           perconaVerStr1=${NEW_db_ver}
         fi
         if [[ "`echo ${NEW_db_ver} | awk -F. '{print $1"."$2}'`" =~ ^5.7$|^8.0$ ]]; then
-           DB_filename=Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.glibc2.12
+           DB_filename=Percona-Server-${perconaVerStr1}-Linux.x86_64.glibc2.12
         else
-           DB_filename=Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}
+           DB_filename=Percona-Server-${perconaVerStr1}-Linux.x86_64.${sslLibVer}
         fi
         DB_URL=https://www.percona.com/downloads/Percona-Server-`echo ${NEW_db_ver} | awk -F. '{print $1"."$2}'`/Percona-Server-${NEW_db_ver}/binary/tarball/${DB_filename}.tar.gz
       elif [ "${DB}" == 'MySQL' ]; then
-        DB_filename=mysql-${NEW_db_ver}-linux-glibc2.12-${SYS_BIT_b}
+        DB_filename=mysql-${NEW_db_ver}-linux-glibc2.12-x86_64
         if [ `echo ${OLD_db_ver} | awk -F. '{print $1"."$2}'` == '8.0' ]; then
           DB_URL=${DOWN_ADDR}/MySQL-`echo ${NEW_db_ver} | awk -F. '{print $1"."$2}'`/${DB_filename}.tar.xz
         else

include/upgrade_oneinstack.sh

@@ -52,6 +52,7 @@ Upgrade_OneinStack() {
       [ -e "/usr/local/php73/etc/php.ini" ] && sed -i 's@^cgi.fix_pathinfo=0@;&@' /usr/local/php73/etc/php.ini 2>/dev/null
       [ -e "/usr/local/php74/etc/php.ini" ] && sed -i 's@^cgi.fix_pathinfo=0@;&@' /usr/local/php74/etc/php.ini 2>/dev/null
       [ -e "/usr/local/php80/etc/php.ini" ] && sed -i 's@^cgi.fix_pathinfo=0@;&@' /usr/local/php80/etc/php.ini 2>/dev/null
+      [ -e "/usr/local/php81/etc/php.ini" ] && sed -i 's@^cgi.fix_pathinfo=0@;&@' /usr/local/php81/etc/php.ini 2>/dev/null
     fi
     [ -e "/lib/systemd/system/php-fpm.service" ] && { sed -i 's@^PrivateTmp.*@#&@g' /lib/systemd/system/php-fpm.service; systemctl daemon-reload; }
     echo

include/upgrade_redis.sh

@@ -41,11 +41,6 @@ Upgrade_Redis() {
     tar xzf redis-$NEW_redis_ver.tar.gz
     pushd redis-$NEW_redis_ver
     make clean
-    if [ "${OS_BIT}" == '32' ]; then
-      sed -i '1i\CFLAGS= -march=i686' src/Makefile
-      sed -i 's@^OPT=.*@OPT=-O2 -march=i686@' src/.make-settings
-    fi
-
     make -j ${THREAD}
 
     if [ -f "src/redis-server" ]; then

install.sh

@@ -58,7 +58,7 @@ Show_Help() {
                               yaf,yar,redis,memcached,memcache,mongodb,swoole,xdebug
   --nodejs                    Install Nodejs
   --tomcat_option [1-4]       Install Tomcat version
-  --jdk_option [1-4]          Install JDK version
+  --openjdk_option [1-2]      Install OpenJDK version
   --db_option [1-14]          Install DB version
   --dbinstallmethod [1-2]     DB install method, default: 1 binary install
   --dbrootpwd [password]      DB super password
@@ -73,7 +73,7 @@ Show_Help() {
   "
 }
 ARG_NUM=$#
-TEMP=`getopt -o hvV --long help,version,nginx_option:,apache,apache_mode_option:,apache_mpm_option:,php_option:,mphp_ver:,mphp_addons,phpcache_option:,php_extensions:,nodejs,tomcat_option:,jdk_option:,db_option:,dbrootpwd:,dbinstallmethod:,pureftpd,redis,memcached,phpmyadmin,python,ssh_port:,iptables,reboot -- "$@" 2>/dev/null`
+TEMP=`getopt -o hvV --long help,version,nginx_option:,apache,apache_mode_option:,apache_mpm_option:,php_option:,mphp_ver:,mphp_addons,phpcache_option:,php_extensions:,nodejs,tomcat_option:,openjdk_option:,db_option:,dbrootpwd:,dbinstallmethod:,pureftpd,redis,memcached,phpmyadmin,python,ssh_port:,iptables,reboot -- "$@" 2>/dev/null`
 [ $? != 0 ] && echo "${CWARNING}ERROR: unknown argument! ${CEND}" && Show_Help && exit 1
 eval set -- "${TEMP}"
 while :; do
@@ -149,9 +149,9 @@ while :; do
       [[ ! ${tomcat_option} =~ ^[1-4]$ ]] && { echo "${CWARNING}tomcat_option input error! Please only input number 1~4${CEND}"; exit 1; }
       [ -e "$tomcat_install_dir/conf/server.xml" ] && { echo "${CWARNING}Tomcat already installed! ${CEND}" ; unset tomcat_option; }
       ;;
-    --jdk_option)
-      jdk_option=$2; shift 2
-      [[ ! ${jdk_option} =~ ^[1-4]$ ]] && { echo "${CWARNING}jdk_option input error! Please only input number 1~4${CEND}"; exit 1; }
+    --openjdk_option)
+      openjdk_option=$2; shift 2
+      [[ ! ${openjdk_option} =~ ^[1-2]$ ]] && { echo "${CWARNING}openjdk_option input error! Please only input number 1~2${CEND}"; exit 1; }
       ;;
     --db_option)
       db_option=$2; shift 2
@@ -324,28 +324,14 @@ if [ ${ARG_NUM} == 0 ]; then
             echo "${CWARNING}input error! Please only input number 1~5${CEND}"
           else
             [ "${tomcat_option}" != '5' -a -e "$tomcat_install_dir/conf/server.xml" ] && { echo "${CWARNING}Tomcat already installed! ${CEND}" ; unset tomcat_option; }
-            if [[ "${tomcat_option}" =~ ^[1-2]$ ]]; then
+            if [[ "${tomcat_option}" =~ ^[1-3]$ ]]; then
               while :; do echo
-                echo 'Please select JDK version:'
-                echo -e "\t${CMSG}1${CEND}. Install JDK-11.0"
-                echo -e "\t${CMSG}2${CEND}. Install JDK-1.8"
-                read -e -p "Please input a number:(Default 1 press Enter) " jdk_option
-                jdk_option=${jdk_option:-1}
-                if [[ ! ${jdk_option} =~ ^[1-2]$ ]]; then
-                  echo "${CWARNING}input error! Please only input number 1~2${CEND}"
-                else
-                  break
-                fi
-              done
-            elif [ "${tomcat_option}" == '3' ]; then
-              while :; do echo
-                echo 'Please select JDK version:'
-                echo -e "\t${CMSG}1${CEND}. Install JDK-11.0"
-                echo -e "\t${CMSG}2${CEND}. Install JDK-1.8"
-                echo -e "\t${CMSG}3${CEND}. Install JDK-1.7"
-                read -e -p "Please input a number:(Default 2 press Enter) " jdk_option
-                jdk_option=${jdk_option:-2}
-                if [[ ! ${jdk_option} =~ ^[1-3]$ ]]; then
+                echo 'Please select OpenJDK version:'
+                echo -e "\t${CMSG}1${CEND}. Install openjdk-8-jdk"
+                echo -e "\t${CMSG}2${CEND}. Install openjdk-11-jdk"
+                read -e -p "Please input a number:(Default 1 press Enter) " openjdk_option
+                openjdk_option=${openjdk_option:-1}
+                if [[ ! ${openjdk_option} =~ ^[1-2]$ ]]; then
                   echo "${CWARNING}input error! Please only input number 1~3${CEND}"
                 else
                   break
@@ -353,14 +339,12 @@ if [ ${ARG_NUM} == 0 ]; then
               done
             elif [ "${tomcat_option}" == '4' ]; then
               while :; do echo
-                echo 'Please select JDK version:'
-                echo -e "\t${CMSG}2${CEND}. Install JDK-1.8"
-                echo -e "\t${CMSG}3${CEND}. Install JDK-1.7"
-                echo -e "\t${CMSG}4${CEND}. Install JDK-1.6"
-                read -e -p "Please input a number:(Default 3 press Enter) " jdk_option
-                jdk_option=${jdk_option:-3}
-                if [[ ! ${jdk_option} =~ ^[2-4]$ ]]; then
-                  echo "${CWARNING}input error! Please only input number 2~4${CEND}"
+                echo 'Please select OpenJDK version:'
+                echo -e "\t${CMSG}1${CEND}. Install openjdk-8-jdk"
+                read -e -p "Please input a number:(Default 1 press Enter) " openjdk_option
+                openjdk_option=${openjdk_option:-1}
+                if [[ ! ${openjdk_option} =~ ^1$ ]]; then
+                  echo "${CWARNING}input error! Please only input number 1${CEND}"
                 else
                   break
                 fi
@@ -399,7 +383,6 @@ if [ ${ARG_NUM} == 0 ]; then
           echo -e "\t${CMSG}14${CEND}. Install MongoDB"
           read -e -p "Please input a number:(Default 2 press Enter) " db_option
           db_option=${db_option:-2}
-          [[ "${db_option}" =~ ^9$|^14$ ]] && [ "${OS_BIT}" == '32' ] && { echo "${CWARNING}By not supporting 32-bit! ${CEND}"; continue; }
           if [[ "${db_option}" =~ ^[1-9]$|^1[0-4]$ ]]; then
             if [ "${db_option}" == '13' ]; then
               [ -e "${pgsql_install_dir}/bin/psql" ] && { echo "${CWARNING}PostgreSQL already installed! ${CEND}"; unset db_option; break; }
@@ -779,7 +762,6 @@ fi
 # Database
 case "${db_option}" in
   1)
-    [ "${LikeOS}" == 'RHEL' ] && [ ${RHEL_ver} -le 6 >/dev/null 2>&1 ] && dbinstallmethod=1 && checkDownload
     . include/mysql-8.0.sh
     Install_MySQL80 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
@@ -812,7 +794,6 @@ case "${db_option}" in
     Install_MariaDB55 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   9)
-    [ "${LikeOS}" == 'RHEL' ] && [ ${RHEL_ver} -le 6 >/dev/null 2>&1 ] && dbinstallmethod=1 && checkDownload
     [ "${LikeOS}" == 'RHEL' ] && [ "${RHEL_ver}" == '8' ] && dbinstallmethod=2 && checkDownload
     . include/percona-8.0.sh
     Install_Percona80 2>&1 | tee -a ${oneinstack_dir}/install.log
@@ -1059,22 +1040,14 @@ if [ "${mphp_flag}" == 'y' ]; then
 fi
 
 # JDK
-case "${jdk_option}" in
+case "${openjdk_option}" in
   1)
-    . include/jdk-11.0.sh
-    Install_JDK110 2>&1 | tee -a ${oneinstack_dir}/install.log
+    . include/openjdk-8.sh
+    Install_OpenJDK8 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   2)
-    . include/jdk-1.8.sh
-    Install_JDK18 2>&1 | tee -a ${oneinstack_dir}/install.log
-    ;;
-  3)
-    . include/jdk-1.7.sh
-    Install_JDK17 2>&1 | tee -a ${oneinstack_dir}/install.log
-    ;;
-  4)
-    . include/jdk-1.6.sh
-    Install_JDK16 2>&1 | tee -a ${oneinstack_dir}/install.log
+    . include/openjdk-11.sh
+    Install_OpenJDK11 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
 esac
 

src/adoptopenjdk.key

@@ -0,0 +1,53 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFzII+8BEADS8rE0HAdET6h2LjpRbN22+JRzFzD1LvqWFOIozLZ5hA8tAIM4
+dNhTbzMt/evgVi+Qvo+VpwINPYNPVfavWXK3PsiI6tmgECq62ODuyzS3+TBOVZ6G
+RIGVoIWCqvW8gz3CBl5MzUp0iw4uv4cZYI1XJKz9CmOUzoxiCTchs2dFW9UI//AZ
+A6mFVRNG0siIjEOhUON1GygHiSlKh9L5UGZfwnXwBt6B9bOdzstBoQqAIIqoRIFw
+3Qi/N1VFif00h9nkvanGmhLzvqoQdPrfuw9Z0c+rqUpfgx9foUzs3BNQL2RqLBd3
+VcF2mXKdiIrsCJw2n65ORzxGvIcZ9cVt+G4DWThhVsGo963WAO5XyybbdtrV0uoz
+tVL2z9WahUdwoS2Y92R4r2ciose1GbaonrDHb9LXCic1thRt2I+dQ2PA8h8boSAb
+4rfsTA9MbEe8hp7wxDOtE5OPXu3GF0FL8tMxf+/8ZhIHzJaAB5+QbnBJCy44XfMK
+Lh/k0dfz+NEx9pg1yYIJ1hsysNsb6r0+UuEU/k2Qy/cOLXXZYKdSHtKNxTvf9PKy
+HIX1kT6muUGj97S+7T0zD7Tq6WEqwZAAIlWUO5H0KmiPotugF/ahnWEYxRVCQuBf
+Iw1RZVLHVsptdcd/CF/fmlR+k3KO8h6F+At1N17ToZ0Uyq+sRz1HvVS75QARAQAB
+tE1BZG9wdE9wZW5KREsgKHVzZWQgZm9yIHB1Ymxpc2hpbmcgUlBNIGFuZCBERUIg
+ZmlsZXMpIDxhZG9wdG9wZW5qZGtAZ21haWwuY29tPokCOAQTAQIAIgUCXMgj7wIb
+AwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQisOykXSIXAOQShAAqjye6sT+
+/fTsAbkpE055kjb9GSNBLPuPG9eCnn86hl1ge9vSBHfBC/GF4e7Q9BL0QK+rfq07
+1g8UBgdg0Vwx8VZuRR5pzIdr1FWyE0JTyUcOpTsxz5KwA8SEFodN912ajAaVwDm7
+W9Z47bPNFqFjLLqTuNInRxHqQfrytCPQY73HW/bwU0xYPupyF/nQ0qxJYPH3tK1b
+zBvyVIR4mq5p1275fieLdywsIREeP/gwuR//QB48L4ZOmIQ5EE/Pq/tCK02FwMqR
+U61H+YAjsPaA+1OQuvzWysQhBjhd9hxqBawO/U45oVdoYa1WsX0uwKAIVe33Ib8G
+41OxwLlfLWhgQKDa3USpolNf6Qtj3cHQEB61XD7v9B6XbnPV1Wf65VJzyUJdYXQl
+Rzr9zH+r9S/BeB+rCR7eljafYBvIAibmSYq9Cfsji2+bUjVRXGZos4SZNNa4xs/g
+52o7L5B5PSNFr0zzNDcY24Pha1a7nlYc/hWnZ0YtSQsAxaPXj9MpxKQX8q+eCakY
+CYN73zGoc4ILJfYVd6jxkcoWrRrvQxp3m/IujAJMm/6ZbSeYdGENtTsQHsnEo0de
+8CcSUkQg3GX9xQXlZhH8D0WWnRm4n/KJ+pi82wiU9z99nTSq75TrvBmKCT+J8V1B
+uVCzNXsk7zsTOwBEKU/4YSEZC+YeW2iyp765Ag0EXMgj7wEQAN304lBCDHd4oIsl
+s9+B+N9ET5+/W2rUDt9tljB/uzJiifcVyDyFiMn5KKpWO/nTlPU3PRluupR+TdgX
+kFM6Ogyqce7SPMHL5L3r1NzS565SISUOljuBFftlva/LRAsCcSBjvR0D2ycwejW1
+Ctv0lPAf8K0HvA8OlKFTUXJUkFG/43kMZvv4f3URfMZ72nhLyz+rApWX3HuEZvFl
+BhdZPFXf/SHuKSSeVFIoNbMVwnccDFpC9eGdD/GD+0CEhxPzFGy27zjbehIQOHqq
+zJCAELdlFIs4t3kRg5TVwe7lod+pCZNN+VKynx4cKGJP891UR8UO67YRlq/FCB6+
+npVnyHKF9bBM8ZGwG/UnIpFyL0rr4PPoQ9R5RoMz/e7TCRCW0fMPK3USoKsICKgr
+CCtQIuTKO6oIRFe868uzt4KCkkbD/S/fqFz5ZA65fFnm776h9cFBxXFPWiCWp57S
+Ji91z7hG0Hkut0CPM6EGSilq9am0LuzJv7RlOYv/pOQMoqGUUtiFWf3gYn8IaFgr
+9LVeC5/djZj4I/BSLRJaHfhaHoNScL63tighnUbj6uDeCjpe6C2rwSPWulLAIqF6
+r2ZByLi2hBkyrJnMC2Ew4PH9AMPkyZMDFJ3qSNZiUgwIny+4jYZxfxdTspvZa7dT
+kLk0Uw1McyV8SkSqHaxafulwEbHnABEBAAGJAh8EGAECAAkFAlzII+8CGwwACgkQ
+isOykXSIXANq2hAAkyeNuWadGqieKA/rxX53hPvxAjYmCt6uyXJiq55/9A8FHCf6
+OZE2rF9z0zCy5F6O8S5mieK0c+7DrU06YHrippya3WMldLSn5X6Zh13vNJE8PhG0
+Aw6GQSKHz9C2jD3ScZsbUsEiXEM8WLQVC0VpcNXvNgGBY4eK1dwi4jI+YnqLS1Pm
+xsVlh1oMAeqDRSgz1qznj+2ziKlQvBTSfTURchWsuQK9SBxpnUUmmwzPI9aZX07i
+WVdbkqVqhB3oH50pP4aclYtxjXU778Wpe7stbGFnGHFm6rClC6keUO6rohM1eU1d
+yMD4XQDWLIbpCSVNyd+uJTyqIwJcAgGnZ3g4HnVmbY2iTrWIgaAwFEoGU7B+iEVI
+1ob5c9y085e8UKB7QXv1lb/XXCkE2EWPR2tDbU0Fsip20jNULSq8cQbrSSnDt2lw
+jLyNTiMDUHhVHnuMNktJ2sOwrNAwATlZHftDSxEoj3Y0XAsdVEbMyRvcxdpb8QDR
+4pezrAGj+TlzzqnItDmHhElSxyCf5wbTy5vBEfFNiBRtz0WCmnmnsr61GWH7xtEi
+TDmj/BvGxRwE2a0IEwl5ASTIGzxxHKQm7VIOxd9fwYBkuCrNtylc4mw+g8w0lhpt
+HCm81Da4TubPdAgobrQGlnMVDmgAcN20+RakdKamaki/c5u+pAvEkYNLvlM=
+=SQlh
+-----END PGP PUBLIC KEY BLOCK-----
+

versions.txt

@@ -28,7 +28,7 @@ mariadb105_ver=10.5.15
 mariadb104_ver=10.4.24
 mariadb55_ver=5.5.68
 
-percona80_ver=8.0.26-17
+percona80_ver=8.0.27-18
 percona57_ver=5.7.36-39
 percona56_ver=5.6.51-91.0
 percona55_ver=5.5.62-38.14
@@ -37,12 +37,6 @@ pgsql_ver=12.7
 
 mongodb_ver=4.0.26
 
-# JDK
-jdk110_ver=11.0.12
-jdk18_ver=1.8.0_301
-jdk17_ver=1.7.0_80
-jdk16_ver=1.6.0_45
-
 # PHP
 php53_ver=5.3.29
 php54_ver=5.4.45
@@ -53,11 +47,11 @@ php71_ver=7.1.33
 php72_ver=7.2.34
 php73_ver=7.3.33
 php74_ver=7.4.28
-php80_ver=8.0.16
-php81_ver=8.1.3
+php80_ver=8.0.17
+php81_ver=8.1.4
 
 # Nodejs
-nodejs_ver=16.13.2
+nodejs_ver=16.14.2
 
 libiconv_ver=1.16
 curl_ver=7.82.0
@@ -69,7 +63,7 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
-imagemagick_ver=7.1.0-27
+imagemagick_ver=7.1.0-29
 imagick_ver=3.5.1
 imagick_oldver=3.4.4
 graphicsmagick_ver=1.3.36
@@ -107,7 +101,7 @@ pecl_memcache_ver=4.0.5.2
 pecl_memcache_oldver=3.0.8
 
 # MongoDB
-pecl_mongodb_ver=1.12.1
+pecl_mongodb_ver=1.13.0
 pecl_mongodb_oldver=1.9.2
 pecl_mongo_ver=1.6.16
 
@@ -129,7 +123,7 @@ luajit2_ver=2.1-20220111
 lua_resty_core_ver=0.1.22
 lua_resty_lrucache_ver=0.11
 lua_cjson_ver=2.1.0.8
-python_ver=3.6.13
-setuptools_ver=58.0.4
-pip_ver=21.2.4
+python_ver=3.6.15
+setuptools_ver=61.2.0
+pip_ver=22.0.4
 fail2ban_ver=0.11.2