Rename versions

include/alisql-5.6.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_AliSQL-5-6() {
+Install_AliSQL56() {
   pushd ${oneinstack_dir}/src
 
   id -u mysql >/dev/null 2>&1
@@ -17,8 +17,8 @@ Install_AliSQL-5-6() {
   [ ! -d "${alisql_install_dir}" ] && mkdir -p ${alisql_install_dir}
   mkdir -p ${alisql_data_dir};chown mysql.mysql -R ${alisql_data_dir}
 
-  tar xvf alisql-${alisql_5_6_version}.tar.gz
-  pushd alisql-${alisql_5_6_version}
+  tar xvf alisql-${alisql56_version}.tar.gz
+  pushd alisql-${alisql56_version}
   cmake . -DCMAKE_INSTALL_PREFIX=${alisql_install_dir} \
   -DMYSQL_DATADIR=${alisql_data_dir} \
   -DSYSCONFDIR=/etc \
@@ -39,10 +39,10 @@ Install_AliSQL-5-6() {
 
   if [ -d "${alisql_install_dir}/support-files" ]; then
     echo "${CSUCCESS}AliSQL installed successfully! ${CEND}"
-    rm -rf alisql-${alisql_5_6_version}
+    rm -rf alisql-${alisql56_version}
   else
     rm -rf ${alisql_install_dir}
-    rm -rf alisql-${alisql_5_6_version}
+    rm -rf alisql-${alisql56_version}
     echo "${CFAILURE}AliSQL install failed, Please contact the author! ${CEND}"
     kill -9 $$
   fi

include/apache-2.2.sh

@@ -8,12 +8,12 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_Apache-2-2() {
+Install_Apache22() {
   pushd ${oneinstack_dir}/src
   id -u $run_user >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin $run_user
-  tar xzf httpd-$apache_2_version.tar.gz
-  pushd httpd-$apache_2_version
+  tar xzf httpd-$apache22_version.tar.gz
+  pushd httpd-$apache22_version
   [ ! -d "$apache_install_dir" ] && mkdir -p $apache_install_dir
   [ "${Ubuntu_version}" == "12" ] && sed -i '@SSL_PROTOCOL_SSLV2@d' modules/ssl/ssl_engine_io.c
   LDFLAGS=-ldl ./configure --prefix=$apache_install_dir --with-mpm=prefork --with-included-apr --enable-headers --enable-deflate --enable-so --enable-rewrite --enable-ssl --with-ssl --enable-expires --enable-static-support --enable-suexec --enable-modules=all --enable-mods-shared=all
@@ -22,7 +22,7 @@ Install_Apache-2-2() {
   if [ -e "$apache_install_dir/conf/httpd.conf" ]; then
     echo "${CSUCCESS}Apache installed successfully! ${CEND}"
     popd
-    rm -rf httpd-$apache_2_version
+    rm -rf httpd-$apache22_version
   else
     rm -rf $apache_install_dir
     echo "${CFAILURE}Apache install failed, Please contact the author! ${CEND}"

include/apache-2.4.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_Apache-2-4() {
+Install_Apache24() {
   pushd ${oneinstack_dir}/src
   tar xzf pcre-$pcre_version.tar.gz
   pushd pcre-$pcre_version
@@ -17,10 +17,10 @@ Install_Apache-2-4() {
   popd
   id -u $run_user >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin $run_user
-  tar xzf httpd-$apache_4_version.tar.gz
+  tar xzf httpd-$apache24_version.tar.gz
   tar xzf apr-$apr_version.tar.gz
   tar xzf apr-util-$apr_util_version.tar.gz
-  pushd httpd-$apache_4_version
+  pushd httpd-$apache24_version
   [ ! -d "$apache_install_dir" ] && mkdir -p $apache_install_dir
   /bin/cp -R ../apr-$apr_version ./srclib/apr
   /bin/cp -R ../apr-util-$apr_util_version ./srclib/apr-util
@@ -30,7 +30,7 @@ Install_Apache-2-4() {
   if [ -e "$apache_install_dir/conf/httpd.conf" ]; then
     echo "${CSUCCESS}Apache installed successfully! ${CEND}"
     popd 
-    rm -rf httpd-$apache_4_version
+    rm -rf httpd-$apache24_version
   else
     rm -rf $apache_install_dir
     echo "${CFAILURE}Apache install failed, Please contact the author! ${CEND}"

include/check_download.sh

@@ -40,11 +40,11 @@ checkDownload(){
       echo "Download apache 2.4..."
       src_url=http://archive.apache.org/dist/apr/apr-${apr_version}.tar.gz && Download_src
       src_url=http://archive.apache.org/dist/apr/apr-util-${apr_util_version}.tar.gz && Download_src
-      src_url=http://mirrors.linuxeye.com/apache/httpd/httpd-${apache_4_version}.tar.gz && Download_src
+      src_url=http://mirrors.linuxeye.com/apache/httpd/httpd-${apache24_version}.tar.gz && Download_src
     fi
     if [ "${Apache_version}" == '2' ]; then
       echo "Download apache 2.2..."
-      src_url=http://mirrors.linuxeye.com/apache/httpd/httpd-${apache_2_version}.tar.gz && Download_src
+      src_url=http://mirrors.linuxeye.com/apache/httpd/httpd-${apache22_version}.tar.gz && Download_src
 
       echo "Download mod_remoteip.c for apache 2.2..."
       src_url=${mirrorLink}/mod_remoteip.c && Download_src
@@ -54,18 +54,18 @@ checkDownload(){
     case "${Tomcat_version}" in
       1)
         echo "Download tomcat 8..."
-        src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat_8_version}/apache-tomcat-${tomcat_8_version}.tar.gz && Download_src
-        src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat_8_version}/catalina-jmx-remote.jar && Download_src
+        src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat8_version}/apache-tomcat-${tomcat8_version}.tar.gz && Download_src
+        src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat8_version}/catalina-jmx-remote.jar && Download_src
         ;;
       2)
         echo "Download tomcat 7..."
-        src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat_7_version}/apache-tomcat-${tomcat_7_version}.tar.gz && Download_src
-        src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat_7_version}/catalina-jmx-remote.jar && Download_src
+        src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat7_version}/apache-tomcat-${tomcat7_version}.tar.gz && Download_src
+        src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat7_version}/catalina-jmx-remote.jar && Download_src
         ;;
       3)
         echo "Download tomcat 6..."
-        src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat_6_version}/apache-tomcat-${tomcat_6_version}.tar.gz && Download_src
-        src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat_6_version}/catalina-jmx-remote.jar && Download_src
+        src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat6_version}/apache-tomcat-${tomcat6_version}.tar.gz && Download_src
+        src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat6_version}/catalina-jmx-remote.jar && Download_src
         ;;
     esac
 
@@ -73,15 +73,15 @@ checkDownload(){
       case "${JDK_version}" in
         1)
           echo "Download JDK 1.8..."
-          JDK_FILE="jdk-$(echo ${jdk_8_version} | awk -F. '{print $2}')u$(echo ${jdk_8_version} | awk -F_ '{print $NF}')-linux-${SYS_BIG_FLAG}.tar.gz"
+          JDK_FILE="jdk-$(echo ${jdk18_version} | awk -F. '{print $2}')u$(echo ${jdk18_version} | awk -F_ '{print $NF}')-linux-${SYS_BIG_FLAG}.tar.gz"
           ;;
         2)
           echo "Download JDK 1.7..."
-          JDK_FILE="jdk-$(echo ${jdk_7_version} | awk -F. '{print $2}')u$(echo ${jdk_7_version} | awk -F_ '{print $NF}')-linux-${SYS_BIG_FLAG}.tar.gz"
+          JDK_FILE="jdk-$(echo ${jdk17_version} | awk -F. '{print $2}')u$(echo ${jdk17_version} | awk -F_ '{print $NF}')-linux-${SYS_BIG_FLAG}.tar.gz"
           ;;
         3)
           echo "Download JDK 1.6..."
-          JDK_FILE="jdk-$(echo ${jdk_6_version} | awk -F. '{print $2}')u$(echo ${jdk_6_version} | awk -F_ '{print $NF}')-linux-${SYS_BIG_FLAG}.bin"
+          JDK_FILE="jdk-$(echo ${jdk16_version} | awk -F. '{print $2}')u$(echo ${jdk16_version} | awk -F_ '{print $NF}')-linux-${SYS_BIG_FLAG}.bin"
           ;;
       esac
       # start download...
@@ -121,10 +121,10 @@ checkDownload(){
         fi
         if [ "${dbInstallMethods}" == '1' ]; then
           echo "Download MySQL 5.7 binary package..."
-          FILE_NAME=mysql-${mysql_5_7_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz
+          FILE_NAME=mysql-${mysql57_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz
         elif [ "${dbInstallMethods}" == '2' ]; then
           echo "Download MySQL 5.7 source package..."
-          FILE_NAME=mysql-${mysql_5_7_version}.tar.gz
+          FILE_NAME=mysql-${mysql57_version}.tar.gz
         fi
         # start download
         wget --tries=6 -c --no-check-certificate ${DOWN_ADDR_MYSQL}/${FILE_NAME}
@@ -168,10 +168,10 @@ checkDownload(){
         fi
         if [ "${dbInstallMethods}" == '1' ]; then
           echo "Download MySQL 5.6 binary package..."
-          FILE_NAME=mysql-${mysql_5_6_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz
+          FILE_NAME=mysql-${mysql56_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz
         elif [ "${dbInstallMethods}" == '2' ]; then
           echo "Download MySQL 5.6 source package..."
-          FILE_NAME=mysql-${mysql_5_6_version}.tar.gz
+          FILE_NAME=mysql-${mysql56_version}.tar.gz
         fi
         wget --tries=6 -c --no-check-certificate ${DOWN_ADDR_MYSQL}/${FILE_NAME}
         wget --tries=6 -c --no-check-certificate ${DOWN_ADDR_MYSQL}/${FILE_NAME}.md5
@@ -213,10 +213,10 @@ checkDownload(){
         fi
         if [ "${dbInstallMethods}" == '1' ]; then
           echo "Download MySQL 5.5 binary package..."
-          FILE_NAME=mysql-${mysql_5_5_version}-linux2.6-${SYS_BIT_b}.tar.gz
+          FILE_NAME=mysql-${mysql55_version}-linux2.6-${SYS_BIT_b}.tar.gz
         elif [ "${dbInstallMethods}" == '2' ]; then
           echo "Download MySQL 5.5 source package..."
-          FILE_NAME=mysql-${mysql_5_5_version}.tar.gz
+          FILE_NAME=mysql-${mysql55_version}.tar.gz
           src_url=${mirrorLink}/mysql-5.5-fix-arm-client_plugin.patch && Download_src
         fi
         wget --tries=6 -c --no-check-certificate ${DOWN_ADDR_MYSQL}/${FILE_NAME}
@@ -240,25 +240,25 @@ checkDownload(){
         # MariaDB 10.1
         if [ "${dbInstallMethods}" == '1' ]; then
           echo "Download MariaDB 10.1 binary package..."
-          FILE_NAME=mariadb-${mariadb_10_1_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
+          FILE_NAME=mariadb-${mariadb101_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
           if [ "${IPADDR_COUNTRY}"x == "CN"x ]; then
-            DOWN_ADDR_MARIADB=https://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-${mariadb_10_1_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}
+            DOWN_ADDR_MARIADB=https://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-${mariadb101_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}
             MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}')
-            [ -z "${MARAIDB_TAR_MD5}" ] && { DOWN_ADDR_MARIADB=https://mirrors.ustc.edu.cn/mariadb/mariadb-${mariadb_10_1_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}; MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}'); }
+            [ -z "${MARAIDB_TAR_MD5}" ] && { DOWN_ADDR_MARIADB=https://mirrors.ustc.edu.cn/mariadb/mariadb-${mariadb101_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}; MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}'); }
           else
-            DOWN_ADDR_MARIADB=https://downloads.mariadb.org/interstitial/mariadb-${mariadb_10_1_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}
-            MARAIDB_TAR_MD5=$(curl -Lk http://archive.mariadb.org/mariadb-${mariadb_10_1_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}/md5sums.txt |  grep ${FILE_NAME} | awk '{print $1}')
+            DOWN_ADDR_MARIADB=https://downloads.mariadb.org/interstitial/mariadb-${mariadb101_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}
+            MARAIDB_TAR_MD5=$(curl -Lk http://archive.mariadb.org/mariadb-${mariadb101_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}/md5sums.txt |  grep ${FILE_NAME} | awk '{print $1}')
           fi
         elif [ "${dbInstallMethods}" == '2' ]; then
           echo "Download MariaDB 10.1 source package..."
-          FILE_NAME=mariadb-${mariadb_10_1_version}.tar.gz
+          FILE_NAME=mariadb-${mariadb101_version}.tar.gz
           if [ "${IPADDR_COUNTRY}"x == "CN"x ]; then
-            DOWN_ADDR_MARIADB=https://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-${mariadb_10_1_version}/source
+            DOWN_ADDR_MARIADB=https://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-${mariadb101_version}/source
             MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}')
-            [ -z "${MARAIDB_TAR_MD5}" ] && { DOWN_ADDR_MARIADB=https://mirrors.ustc.edu.cn/mariadb/mariadb-${mariadb_10_1_version}/source; MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}'); }
+            [ -z "${MARAIDB_TAR_MD5}" ] && { DOWN_ADDR_MARIADB=https://mirrors.ustc.edu.cn/mariadb/mariadb-${mariadb101_version}/source; MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}'); }
           else
-            DOWN_ADDR_MARIADB=https://downloads.mariadb.org/interstitial/mariadb-${mariadb_10_1_version}/source
-            MARAIDB_TAR_MD5=$(curl -Lk http://archive.mariadb.org/mariadb-${mariadb_10_1_version}/source/md5sums.txt |  grep ${FILE_NAME} | awk '{print $1}')
+            DOWN_ADDR_MARIADB=https://downloads.mariadb.org/interstitial/mariadb-${mariadb101_version}/source
+            MARAIDB_TAR_MD5=$(curl -Lk http://archive.mariadb.org/mariadb-${mariadb101_version}/source/md5sums.txt |  grep ${FILE_NAME} | awk '{print $1}')
           fi
         fi
         tryDlCount=0
@@ -279,25 +279,25 @@ checkDownload(){
         # MariaDB 10.0
         if [ "${dbInstallMethods}" == '1' ]; then
           echo "Download MariaDB 10.0 binary package..."
-          FILE_NAME=mariadb-${mariadb_10_0_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
+          FILE_NAME=mariadb-${mariadb100_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
           if [ "${IPADDR_COUNTRY}"x == "CN"x ]; then
-            DOWN_ADDR_MARIADB=https://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-${mariadb_10_0_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}
+            DOWN_ADDR_MARIADB=https://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-${mariadb100_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}
             MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}')
-            [ -z "${MARAIDB_TAR_MD5}" ] && { DOWN_ADDR_MARIADB=https://mirrors.ustc.edu.cn/mariadb/mariadb-${mariadb_10_0_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}; MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}'); }
+            [ -z "${MARAIDB_TAR_MD5}" ] && { DOWN_ADDR_MARIADB=https://mirrors.ustc.edu.cn/mariadb/mariadb-${mariadb100_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}; MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}'); }
           else
-            DOWN_ADDR_MARIADB=https://downloads.mariadb.org/interstitial/mariadb-${mariadb_10_0_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}
-            MARAIDB_TAR_MD5=$(curl -Lk http://archive.mariadb.org/mariadb-${mariadb_10_0_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}/md5sums.txt |  grep ${FILE_NAME} | awk '{print $1}')
+            DOWN_ADDR_MARIADB=https://downloads.mariadb.org/interstitial/mariadb-${mariadb100_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}
+            MARAIDB_TAR_MD5=$(curl -Lk http://archive.mariadb.org/mariadb-${mariadb100_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}/md5sums.txt |  grep ${FILE_NAME} | awk '{print $1}')
           fi
         elif [ "${dbInstallMethods}" == '2' ]; then
           echo "Download MariaDB 10.0 source package..."
-          FILE_NAME=mariadb-${mariadb_10_0_version}.tar.gz
+          FILE_NAME=mariadb-${mariadb100_version}.tar.gz
           if [ "${IPADDR_COUNTRY}"x == "CN"x ]; then
-            DOWN_ADDR_MARIADB=https://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-${mariadb_10_0_version}/source
+            DOWN_ADDR_MARIADB=https://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-${mariadb100_version}/source
             MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}')
-            [ -z "${MARAIDB_TAR_MD5}" ] && { DOWN_ADDR_MARIADB=https://mirrors.ustc.edu.cn/mariadb/mariadb-${mariadb_10_0_version}/source; MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}'); }
+            [ -z "${MARAIDB_TAR_MD5}" ] && { DOWN_ADDR_MARIADB=https://mirrors.ustc.edu.cn/mariadb/mariadb-${mariadb100_version}/source; MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}'); }
           else
-            DOWN_ADDR_MARIADB=https://downloads.mariadb.org/interstitial/mariadb-${mariadb_10_0_version}/source
-            MARAIDB_TAR_MD5=$(curl -Lk http://archive.mariadb.org/mariadb-${mariadb_10_0_version}/source/md5sums.txt |  grep ${FILE_NAME} | awk '{print $1}')
+            DOWN_ADDR_MARIADB=https://downloads.mariadb.org/interstitial/mariadb-${mariadb100_version}/source
+            MARAIDB_TAR_MD5=$(curl -Lk http://archive.mariadb.org/mariadb-${mariadb100_version}/source/md5sums.txt |  grep ${FILE_NAME} | awk '{print $1}')
           fi
         fi
         tryDlCount=0
@@ -318,25 +318,25 @@ checkDownload(){
         # MariaDB 5.5
         if [ "${dbInstallMethods}" == '1' ]; then
           echo "Download MariaDB 5.5 binary package..."
-          FILE_NAME=mariadb-${mariadb_5_5_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
+          FILE_NAME=mariadb-${mariadb55_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
           if [ "${IPADDR_COUNTRY}"x == "CN"x ]; then
-            DOWN_ADDR_MARIADB=https://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-${mariadb_5_5_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}
+            DOWN_ADDR_MARIADB=https://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-${mariadb55_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}
             MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}')
-            [ -z "${MARAIDB_TAR_MD5}" ] && { DOWN_ADDR_MARIADB=https://mirrors.ustc.edu.cn/mariadb/mariadb-${mariadb_5_5_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}; MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}'); }
+            [ -z "${MARAIDB_TAR_MD5}" ] && { DOWN_ADDR_MARIADB=https://mirrors.ustc.edu.cn/mariadb/mariadb-${mariadb55_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}; MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}'); }
           else
-            DOWN_ADDR_MARIADB=https://downloads.mariadb.org/interstitial/mariadb-${mariadb_5_5_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}
-            MARAIDB_TAR_MD5=$(curl -Lk http://archive.mariadb.org/mariadb-${mariadb_5_5_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}/md5sums.txt |  grep ${FILE_NAME} | awk '{print $1}')
+            DOWN_ADDR_MARIADB=https://downloads.mariadb.org/interstitial/mariadb-${mariadb55_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}
+            MARAIDB_TAR_MD5=$(curl -Lk http://archive.mariadb.org/mariadb-${mariadb55_version}/bintar-${GLIBC_FLAG}-${SYS_BIT_a}/md5sums.txt |  grep ${FILE_NAME} | awk '{print $1}')
           fi
         elif [ "${dbInstallMethods}" == '2' ]; then
           echo "Download MariaDB 5.5 source package..."
-          FILE_NAME=mariadb-${mariadb_5_5_version}.tar.gz
+          FILE_NAME=mariadb-${mariadb55_version}.tar.gz
           if [ "${IPADDR_COUNTRY}"x == "CN"x ]; then
-            DOWN_ADDR_MARIADB=https://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-${mariadb_5_5_version}/source
+            DOWN_ADDR_MARIADB=https://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-${mariadb55_version}/source
             MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}')
-            [ -z "${MARAIDB_TAR_MD5}" ] && { DOWN_ADDR_MARIADB=https://mirrors.ustc.edu.cn/mariadb/mariadb-${mariadb_5_5_version}/source; MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}'); }
+            [ -z "${MARAIDB_TAR_MD5}" ] && { DOWN_ADDR_MARIADB=https://mirrors.ustc.edu.cn/mariadb/mariadb-${mariadb55_version}/source; MARAIDB_TAR_MD5=$(curl -Lk ${DOWN_ADDR_MARIADB}/md5sums.txt | grep ${FILE_NAME} | awk '{print $1}'); }
           else
-            DOWN_ADDR_MARIADB=https://downloads.mariadb.org/interstitial/mariadb-${mariadb_5_5_version}/source
-            MARAIDB_TAR_MD5=$(curl -Lk http://archive.mariadb.org/mariadb-${mariadb_5_5_version}/source/md5sums.txt |  grep ${FILE_NAME} | awk '{print $1}')
+            DOWN_ADDR_MARIADB=https://downloads.mariadb.org/interstitial/mariadb-${mariadb55_version}/source
+            MARAIDB_TAR_MD5=$(curl -Lk http://archive.mariadb.org/mariadb-${mariadb55_version}/source/md5sums.txt |  grep ${FILE_NAME} | awk '{print $1}')
           fi
         fi
         tryDlCount=0
@@ -357,19 +357,19 @@ checkDownload(){
         # Precona 5.7
         if [ "${dbInstallMethods}" == '1' ]; then
           echo "Download Percona 5.7 binary package..."
-          FILE_NAME=Percona-Server-${percona_5_7_version}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
-          DOWN_ADDR_PERCONA=https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${percona_5_7_version}/binary/tarball
-          PERCONA_TAR_MD5=$(curl -Lk https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${percona_5_7_version}/binary/tarball/${FILE_NAME}.md5sum |  grep ${FILE_NAME} | awk '{print $1}')
+          FILE_NAME=Percona-Server-${percona57_version}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
+          DOWN_ADDR_PERCONA=https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${percona57_version}/binary/tarball
+          PERCONA_TAR_MD5=$(curl -Lk https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${percona57_version}/binary/tarball/${FILE_NAME}.md5sum |  grep ${FILE_NAME} | awk '{print $1}')
         elif [ "${dbInstallMethods}" == '2' ]; then
           echo "Download Percona 5.7 source package..."
-          FILE_NAME=percona-server-${percona_5_7_version}.tar.gz
+          FILE_NAME=percona-server-${percona57_version}.tar.gz
           if [ "${IPADDR_COUNTRY}"x == "CN"x ]; then
             DOWN_ADDR_PERCONA=${mirrorLink}
             DOWN_ADDR_PERCONA_2=https://www.percona.com/downloads/Percona-Server-5.7/source/tarball
             PERCONA_TAR_MD5=$(curl -Lk ${DOWN_ADDR_PERCONA_2}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}')
             [ -z "${PERCONA_TAR_MD5}" ] && { DOWN_ADDR_PERCONA=${mirrorLink}; PERCONA_TAR_MD5=$(curl -Lk ${DOWN_ADDR_PERCONA_2}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}'); }
           else
-            DOWN_ADDR_PERCONA=https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${percona_5_7_version}/source/tarball
+            DOWN_ADDR_PERCONA=https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${percona57_version}/source/tarball
             PERCONA_TAR_MD5=$(curl -Lk ${DOWN_ADDR_PERCONA}/${FILE_NAME}.md5sum |  grep ${FILE_NAME} | awk '{print $1}')
           fi
         fi
@@ -391,20 +391,20 @@ checkDownload(){
         # Precona 5.6
         if [ "${dbInstallMethods}" == '1' ]; then
           echo "Download Percona 5.6 binary package..."
-          perconaVerStr1=$(echo ${percona_5_6_version} | sed "s@-@-rel@")
+          perconaVerStr1=$(echo ${percona56_version} | sed "s@-@-rel@")
           FILE_NAME=Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
-          DOWN_ADDR_PERCONA=https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${percona_5_6_version}/binary/tarball
-          PERCONA_TAR_MD5=$(curl -Lk https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${percona_5_6_version}/binary/tarball/${FILE_NAME}.md5sum |  grep ${FILE_NAME} | awk '{print $1}')
+          DOWN_ADDR_PERCONA=https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${percona56_version}/binary/tarball
+          PERCONA_TAR_MD5=$(curl -Lk https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${percona56_version}/binary/tarball/${FILE_NAME}.md5sum |  grep ${FILE_NAME} | awk '{print $1}')
         elif [ "${dbInstallMethods}" == '2' ]; then
           echo "Download Percona 5.6 source package..."
-          FILE_NAME=percona-server-${percona_5_6_version}.tar.gz
+          FILE_NAME=percona-server-${percona56_version}.tar.gz
           if [ "${IPADDR_COUNTRY}"x == "CN"x ]; then
             DOWN_ADDR_PERCONA=${mirrorLink}
-            DOWN_ADDR_PERCONA_2=https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${percona_5_6_version}/source/tarball
+            DOWN_ADDR_PERCONA_2=https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${percona56_version}/source/tarball
             PERCONA_TAR_MD5=$(curl -Lk ${DOWN_ADDR_PERCONA_2}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}')
             [ -z "${PERCONA_TAR_MD5}" ] && { DOWN_ADDR_PERCONA=${mirrorLink}; PERCONA_TAR_MD5=$(curl -Lk ${DOWN_ADDR_PERCONA_2}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}'); }
           else
-            DOWN_ADDR_PERCONA=https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${percona_5_6_version}/source/tarball
+            DOWN_ADDR_PERCONA=https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${percona56_version}/source/tarball
             PERCONA_TAR_MD5=$(curl -Lk ${DOWN_ADDR_PERCONA}/${FILE_NAME}.md5sum |  grep ${FILE_NAME} | awk '{print $1}')
           fi
         fi
@@ -426,20 +426,20 @@ checkDownload(){
         # Percona 5.5
         if [ "${dbInstallMethods}" == '1' ]; then
           echo "Download Percona 5.5 binary package..."
-          perconaVerStr1=$(echo ${percona_5_5_version} | sed "s@-@-rel@")
+          perconaVerStr1=$(echo ${percona55_version} | sed "s@-@-rel@")
           FILE_NAME=Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
-          DOWN_ADDR_PERCONA=https://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${percona_5_5_version}/binary/tarball
-          PERCONA_TAR_MD5=$(curl -Lk https://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${percona_5_5_version}/binary/tarball/${FILE_NAME}.md5sum |  grep ${FILE_NAME} | awk '{print $1}')
+          DOWN_ADDR_PERCONA=https://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${percona55_version}/binary/tarball
+          PERCONA_TAR_MD5=$(curl -Lk https://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${percona55_version}/binary/tarball/${FILE_NAME}.md5sum |  grep ${FILE_NAME} | awk '{print $1}')
         elif [ "${dbInstallMethods}" == '2' ]; then
           echo "Download Percona 5.5 source package..."
-          FILE_NAME=percona-server-${percona_5_5_version}.tar.gz
+          FILE_NAME=percona-server-${percona55_version}.tar.gz
           if [ "${IPADDR_COUNTRY}"x == "CN"x ]; then
             DOWN_ADDR_PERCONA=${mirrorLink}
-            DOWN_ADDR_PERCONA_2=https://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${percona_5_5_version}/source/tarball
+            DOWN_ADDR_PERCONA_2=https://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${percona55_version}/source/tarball
             PERCONA_TAR_MD5=$(curl -Lk ${DOWN_ADDR_PERCONA_2}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}')
             [ -z "${PERCONA_TAR_MD5}" ] && { DOWN_ADDR_PERCONA=${mirrorLink}; PERCONA_TAR_MD5=$(curl -Lk ${DOWN_ADDR_PERCONA_2}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}'); }
           else
-            DOWN_ADDR_PERCONA=https://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${percona_5_5_version}/source/tarball
+            DOWN_ADDR_PERCONA=https://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${percona55_version}/source/tarball
             PERCONA_TAR_MD5=$(curl -Lk ${DOWN_ADDR_PERCONA}/${FILE_NAME}.md5sum | grep ${FILE_NAME} | awk '{print $1}')
           fi
         fi
@@ -461,7 +461,7 @@ checkDownload(){
         # AliSQL 5.6
         DOWN_ADDR_ALISQL=$mirrorLink
         echo "Download AliSQL 5.6 source package..."
-        FILE_NAME=alisql-${alisql_5_6_version}.tar.gz
+        FILE_NAME=alisql-${alisql56_version}.tar.gz
         wget --tries=6 -c --no-check-certificate ${DOWN_ADDR_ALISQL}/${FILE_NAME}
         wget --tries=6 -c --no-check-certificate ${DOWN_ADDR_ALISQL}/${FILE_NAME}.md5
         ALISQL_TAR_MD5=$(awk '{print $1}' ${FILE_NAME}.md5)
@@ -495,22 +495,22 @@ checkDownload(){
             src_url=${mirrorLink}/curl-7.35.0.tar.gz && Download_src
           fi
         fi
-        src_url=http://www.php.net/distributions/php-${php_3_version}.tar.gz && Download_src
+        src_url=http://www.php.net/distributions/php-${php53_version}.tar.gz && Download_src
         src_url=${mirrorLink}/fpm-race-condition.patch && Download_src
         ;;
       2)
-        src_url=http://www.php.net/distributions/php-${php_4_version}.tar.gz && Download_src
+        src_url=http://www.php.net/distributions/php-${php54_version}.tar.gz && Download_src
         src_url=${mirrorLink}/fpm-race-condition.patch && Download_src
         ;;
       3)
-        src_url=http://www.php.net/distributions/php-${php_5_version}.tar.gz && Download_src
+        src_url=http://www.php.net/distributions/php-${php55_version}.tar.gz && Download_src
         src_url=${mirrorLink}/fpm-race-condition.patch && Download_src
         ;;
       4)
-        src_url=http://www.php.net/distributions/php-${php_6_version}.tar.gz && Download_src
+        src_url=http://www.php.net/distributions/php-${php56_version}.tar.gz && Download_src
         ;;
       5)
-        src_url=http://www.php.net/distributions/php-${php_7_version}.tar.gz && Download_src
+        src_url=http://www.php.net/distributions/php-${php70_version}.tar.gz && Download_src
         ;;
     esac
   fi

include/jdk-1.6.sh

@@ -8,12 +8,12 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install-JDK-1-6() {
+Install-JDK16() {
   pushd ${oneinstack_dir}/src
   
-  JDK_FILE="jdk-`echo $jdk_6_version | awk -F. '{print $2}'`u`echo $jdk_6_version | awk -F_ '{print $NF}'`-linux-$SYS_BIG_FLAG.bin"
+  JDK_FILE="jdk-`echo $jdk16_version | awk -F. '{print $2}'`u`echo $jdk16_version | awk -F_ '{print $NF}'`-linux-$SYS_BIG_FLAG.bin"
   JAVA_dir=/usr/java
-  JDK_NAME="jdk$jdk_6_version"
+  JDK_NAME="jdk$jdk16_version"
   JDK_PATH=$JAVA_dir/$JDK_NAME
   
   [ "$OS" == 'CentOS' ] && [ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`

include/jdk-1.7.sh

@@ -8,12 +8,12 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install-JDK-1-7() {
+Install-JDK17() {
   pushd ${oneinstack_dir}/src
 
-  JDK_FILE="jdk-`echo $jdk_7_version | awk -F. '{print $2}'`u`echo $jdk_7_version | awk -F_ '{print $NF}'`-linux-$SYS_BIG_FLAG.tar.gz"
+  JDK_FILE="jdk-`echo $jdk17_version | awk -F. '{print $2}'`u`echo $jdk17_version | awk -F_ '{print $NF}'`-linux-$SYS_BIG_FLAG.tar.gz"
   JAVA_dir=/usr/java
-  JDK_NAME="jdk$jdk_7_version"
+  JDK_NAME="jdk$jdk17_version"
   JDK_PATH=$JAVA_dir/$JDK_NAME
   
   [ "$OS" == 'CentOS' ] && [ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`

include/jdk-1.8.sh

@@ -8,12 +8,12 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install-JDK-1-8() {
+Install-JDK18() {
   pushd ${oneinstack_dir}/src
   
-  JDK_FILE="jdk-`echo $jdk_8_version | awk -F. '{print $2}'`u`echo $jdk_8_version | awk -F_ '{print $NF}'`-linux-$SYS_BIG_FLAG.tar.gz"
+  JDK_FILE="jdk-`echo $jdk18_version | awk -F. '{print $2}'`u`echo $jdk18_version | awk -F_ '{print $NF}'`-linux-$SYS_BIG_FLAG.tar.gz"
   JAVA_dir=/usr/java
-  JDK_NAME="jdk$jdk_8_version"
+  JDK_NAME="jdk$jdk18_version"
   JDK_PATH=$JAVA_dir/$JDK_NAME
   
   [ "$OS" == 'CentOS' ] && [ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`

include/jemalloc.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_jemalloc() {
+Install_Jemalloc() {
   pushd ${oneinstack_dir}/src
   tar xjf jemalloc-$jemalloc_version.tar.bz2
   pushd jemalloc-$jemalloc_version

include/mariadb-10.0.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_MariaDB-10-0() {
+Install_MariaDB100() {
   pushd ${oneinstack_dir}/src
 
   id -u mysql >/dev/null 2>&1
@@ -18,12 +18,12 @@ Install_MariaDB-10-0() {
   mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
 
   if [ "${dbInstallMethods}" == "1" ]; then
-    tar zxf mariadb-${mariadb_10_0_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
-    mv mariadb-${mariadb_10_0_version}-*-${SYS_BIT_b}/* ${mariadb_install_dir}
+    tar zxf mariadb-${mariadb100_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
+    mv mariadb-${mariadb100_version}-*-${SYS_BIT_b}/* ${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
   elif [ "${dbInstallMethods}" == "2" ]; then
-    tar xvf mariadb-${mariadb_10_0_version}.tar.gz
-    pushd mariadb-${mariadb_10_0_version}
+    tar xvf mariadb-${mariadb100_version}.tar.gz
+    pushd mariadb-${mariadb100_version}
     cmake . -DCMAKE_INSTALL_PREFIX=${mariadb_install_dir} \
     -DMYSQL_DATADIR=${mariadb_data_dir} \
     -DSYSCONFDIR=/etc \
@@ -47,13 +47,13 @@ Install_MariaDB-10-0() {
   if [ -d "${mariadb_install_dir}/support-files" ]; then
     echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
     if [ "${dbInstallMethods}" == "1" ]; then
-      rm -rf mariadb-${mariadb_10_0_version}-*-${SYS_BIT_b}
+      rm -rf mariadb-${mariadb100_version}-*-${SYS_BIT_b}
     elif [ "${dbInstallMethods}" == "2" ]; then
-      rm -rf mariadb-${mariadb_10_0_version}
+      rm -rf mariadb-${mariadb100_version}
     fi
   else
     rm -rf ${mariadb_install_dir}
-    rm -rf mariadb-${mariadb_10_0_version}
+    rm -rf mariadb-${mariadb100_version}
     echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}"
     kill -9 $$
   fi

include/mariadb-10.1.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_MariaDB-10-1() {
+Install_MariaDB101() {
   pushd ${oneinstack_dir}/src
 
   id -u mysql >/dev/null 2>&1
@@ -18,12 +18,12 @@ Install_MariaDB-10-1() {
   mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
 
   if [ "${dbInstallMethods}" == "1" ]; then
-    tar zxf mariadb-${mariadb_10_1_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
-    mv mariadb-${mariadb_10_1_version}-*-${SYS_BIT_b}/* ${mariadb_install_dir}
+    tar zxf mariadb-${mariadb101_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
+    mv mariadb-${mariadb101_version}-*-${SYS_BIT_b}/* ${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
   elif [ "${dbInstallMethods}" == "2" ]; then
-    tar xvf mariadb-${mariadb_10_1_version}.tar.gz
-    pushd mariadb-${mariadb_10_1_version}
+    tar xvf mariadb-${mariadb101_version}.tar.gz
+    pushd mariadb-${mariadb101_version}
     cmake . -DCMAKE_INSTALL_PREFIX=${mariadb_install_dir} \
     -DMYSQL_DATADIR=${mariadb_data_dir} \
     -DSYSCONFDIR=/etc \
@@ -47,13 +47,13 @@ Install_MariaDB-10-1() {
   if [ -d "${mariadb_install_dir}/support-files" ]; then
     echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
     if [ "${dbInstallMethods}" == "1" ]; then
-      rm -rf mariadb-${mariadb_10_1_version}-*-${SYS_BIT_b}
+      rm -rf mariadb-${mariadb101_version}-*-${SYS_BIT_b}
     elif [ "${dbInstallMethods}" == "2" ]; then
-      rm -rf mariadb-${mariadb_10_1_version}
+      rm -rf mariadb-${mariadb101_version}
     fi
   else
     rm -rf ${mariadb_install_dir}
-    rm -rf mariadb-${mariadb_10_1_version}
+    rm -rf mariadb-${mariadb101_version}
     echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}"
     kill -9 $$
   fi

include/mariadb-5.5.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_MariaDB-5-5() {
+Install_MariaDB55() {
   pushd ${oneinstack_dir}/src
 
   id -u mysql >/dev/null 2>&1
@@ -18,12 +18,12 @@ Install_MariaDB-5-5() {
   mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
 
   if [ "${dbInstallMethods}" == "1" ]; then
-    tar zxf mariadb-${mariadb_5_5_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
-    mv mariadb-${mariadb_5_5_version}-*-${SYS_BIT_b}/* ${mariadb_install_dir}
+    tar zxf mariadb-${mariadb55_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz
+    mv mariadb-${mariadb55_version}-*-${SYS_BIT_b}/* ${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
   elif [ "${dbInstallMethods}" == "2" ]; then
-    tar xvf mariadb-${mariadb_5_5_version}.tar.gz
-    pushd mariadb-${mariadb_5_5_version}
+    tar xvf mariadb-${mariadb55_version}.tar.gz
+    pushd mariadb-${mariadb55_version}
     [ "${armPlatform}" == "y" ] && patch -p1 < ../mysql-5.5-fix-arm-client_plugin.patch
     cmake . -DCMAKE_INSTALL_PREFIX=${mariadb_install_dir} \
     -DMYSQL_DATADIR=${mariadb_data_dir} \
@@ -49,13 +49,13 @@ Install_MariaDB-5-5() {
   if [ -d "${mariadb_install_dir}/support-files" ]; then
     echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
     if [ "${dbInstallMethods}" == "1" ]; then
-      rm -rf mariadb-${mariadb_5_5_version}-*-${SYS_BIT_b}
+      rm -rf mariadb-${mariadb55_version}-*-${SYS_BIT_b}
     elif [ "${dbInstallMethods}" == "2" ]; then
-      rm -rf mariadb-${mariadb_5_5_version}
+      rm -rf mariadb-${mariadb55_version}
     fi
   else
     rm -rf ${mariadb_install_dir}
-    rm -rf mariadb-${mariadb_5_5_version}
+    rm -rf mariadb-${mariadb55_version}
     echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}"
     kill -9 $$
   fi

include/mysql-5.5.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_MySQL-5-5() {
+Install_MySQL55() {
   pushd ${oneinstack_dir}/src
 
   id -u mysql >/dev/null 2>&1
@@ -18,12 +18,12 @@ Install_MySQL-5-5() {
   mkdir -p ${mysql_data_dir};chown mysql.mysql -R ${mysql_data_dir}
 
   if [ "${dbInstallMethods}" == "1" ]; then
-    tar xvf mysql-${mysql_5_5_version}-linux2.6-${SYS_BIT_b}.tar.gz
-    mv mysql-${mysql_5_5_version}-linux2.6-${SYS_BIT_b}/* ${mysql_install_dir}
+    tar xvf mysql-${mysql55_version}-linux2.6-${SYS_BIT_b}.tar.gz
+    mv mysql-${mysql55_version}-linux2.6-${SYS_BIT_b}/* ${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
   elif [ "${dbInstallMethods}" == "2" ]; then
-    tar xvf mysql-${mysql_5_5_version}.tar.gz
-    pushd mysql-${mysql_5_5_version}
+    tar xvf mysql-${mysql55_version}.tar.gz
+    pushd mysql-${mysql55_version}
     [ "${armPlatform}" == "y" ] && patch -p1 < ../mysql-5.5-fix-arm-client_plugin.patch
     cmake . -DCMAKE_INSTALL_PREFIX=${mysql_install_dir} \
     -DMYSQL_DATADIR=${mysql_data_dir} \
@@ -49,13 +49,13 @@ Install_MySQL-5-5() {
   if [ -d "${mysql_install_dir}/support-files" ]; then
     echo "${CSUCCESS}MySQL installed successfully! ${CEND}"
     if [ "${dbInstallMethods}" == "1" ]; then
-      rm -rf mysql-${mysql_5_5_version}-*-${SYS_BIT_b}
+      rm -rf mysql-${mysql55_version}-*-${SYS_BIT_b}
     elif [ "${dbInstallMethods}" == "2" ]; then
-      rm -rf mysql-${mysql_5_5_version}
+      rm -rf mysql-${mysql55_version}
     fi
   else
     rm -rf ${mysql_install_dir}
-    rm -rf mysql-${mysql_5_5_version}
+    rm -rf mysql-${mysql55_version}
     echo "${CFAILURE}MySQL install failed, Please contact the author! ${CEND}"
     kill -9 $$
   fi

include/mysql-5.6.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_MySQL-5-6() {
+Install_MySQL56() {
   pushd ${oneinstack_dir}/src
 
   id -u mysql >/dev/null 2>&1
@@ -18,12 +18,12 @@ Install_MySQL-5-6() {
   mkdir -p ${mysql_data_dir};chown mysql.mysql -R ${mysql_data_dir}
 
   if [ "${dbInstallMethods}" == "1" ]; then
-    tar xvf mysql-${mysql_5_6_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz
-    mv mysql-${mysql_5_6_version}-linux-glibc2.5-${SYS_BIT_b}/* ${mysql_install_dir}
+    tar xvf mysql-${mysql56_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz
+    mv mysql-${mysql56_version}-linux-glibc2.5-${SYS_BIT_b}/* ${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
   elif [ "${dbInstallMethods}" == "2" ]; then
-    tar xvf mysql-${mysql_5_6_version}.tar.gz
-    pushd mysql-${mysql_5_6_version}
+    tar xvf mysql-${mysql56_version}.tar.gz
+    pushd mysql-${mysql56_version}
     cmake . -DCMAKE_INSTALL_PREFIX=${mysql_install_dir} \
     -DMYSQL_DATADIR=${mysql_data_dir} \
     -DSYSCONFDIR=/etc \
@@ -47,13 +47,13 @@ Install_MySQL-5-6() {
   if [ -d "${mysql_install_dir}/support-files" ]; then
     echo "${CSUCCESS}MySQL installed successfully! ${CEND}"
     if [ "${dbInstallMethods}" == "1" ]; then
-      rm -rf mysql-${mysql_5_6_version}-*-${SYS_BIT_b}
+      rm -rf mysql-${mysql56_version}-*-${SYS_BIT_b}
     elif [ "${dbInstallMethods}" == "2" ]; then
-      rm -rf mysql-${mysql_5_6_version}
+      rm -rf mysql-${mysql56_version}
     fi
   else
     rm -rf ${mysql_install_dir}
-    rm -rf mysql-${mysql_5_6_version}
+    rm -rf mysql-${mysql56_version}
     echo "${CFAILURE}MySQL install failed, Please contact the author! ${CEND}"
     kill -9 $$
   fi

include/mysql-5.7.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_MySQL-5-7() {
+Install_MySQL57() {
   pushd ${oneinstack_dir}/src
 
   id -u mysql >/dev/null 2>&1
@@ -18,12 +18,12 @@ Install_MySQL-5-7() {
   mkdir -p ${mysql_data_dir};chown mysql.mysql -R ${mysql_data_dir}
 
   if [ "${dbInstallMethods}" == "1" ]; then
-    tar xvf mysql-${mysql_5_7_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz
-    mv mysql-${mysql_5_7_version}-linux-glibc2.5-${SYS_BIT_b}/* ${mysql_install_dir}
+    tar xvf mysql-${mysql57_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz
+    mv mysql-${mysql57_version}-linux-glibc2.5-${SYS_BIT_b}/* ${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
   elif [ "${dbInstallMethods}" == "2" ]; then
-    tar xvf mysql-${mysql_5_7_version}.tar.gz
-    pushd mysql-${mysql_5_7_version}
+    tar xvf mysql-${mysql57_version}.tar.gz
+    pushd mysql-${mysql57_version}
     cmake . -DCMAKE_INSTALL_PREFIX=${mysql_install_dir} \
     -DMYSQL_DATADIR=${mysql_data_dir} \
     -DSYSCONFDIR=/etc \
@@ -47,13 +47,13 @@ Install_MySQL-5-7() {
   if [ -d "${mysql_install_dir}/support-files" ]; then
     echo "${CSUCCESS}MySQL installed successfully! ${CEND}"
     if [ "${dbInstallMethods}" == "1" ]; then
-      rm -rf mysql-${mysql_5_7_version}-*-${SYS_BIT_b}
+      rm -rf mysql-${mysql57_version}-*-${SYS_BIT_b}
     elif [ "${dbInstallMethods}" == "2" ]; then
-      rm -rf mysql-${mysql_5_7_version}
+      rm -rf mysql-${mysql57_version}
     fi
   else
     rm -rf ${mysql_install_dir}
-    rm -rf mysql-${mysql_5_7_version}
+    rm -rf mysql-${mysql57_version}
     echo "${CFAILURE}MySQL install failed, Please contact the author! ${CEND}"
     kill -9 $$
   fi

include/percona-5.5.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_Percona-5-5() {
+Install_Percona55() {
   pushd ${oneinstack_dir}/src
 
   id -u mysql >/dev/null 2>&1
@@ -18,13 +18,13 @@ Install_Percona-5-5() {
   mkdir -p ${percona_data_dir};chown mysql.mysql -R ${percona_data_dir}
 
   if [ "${dbInstallMethods}" == "1" ]; then
-    perconaVerStr1=$(echo ${percona_5_5_version} | sed "s@-@-rel@")
+    perconaVerStr1=$(echo ${percona55_version} | sed "s@-@-rel@")
     tar xvf Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
     mv Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${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
   elif [ "${dbInstallMethods}" == "2" ]; then
-    tar xvf percona-server-${percona_5_5_version}.tar.gz
-    pushd percona-server-${percona_5_5_version}
+    tar xvf percona-server-${percona55_version}.tar.gz
+    pushd percona-server-${percona55_version}
     [ "${armPlatform}" == "y" ] && patch -p1 < ../mysql-5.5-fix-arm-client_plugin.patch
     cmake . -DCMAKE_INSTALL_PREFIX=${percona_install_dir} \
     -DMYSQL_DATADIR=${percona_data_dir} \
@@ -52,11 +52,11 @@ Install_Percona-5-5() {
     if [ "${dbInstallMethods}" == "1" ]; then
       rm -rf Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}
     elif [ "${dbInstallMethods}" == "2" ]; then
-    rm -rf percona-server-${percona_5_5_version}
+    rm -rf percona-server-${percona55_version}
     fi
   else
     rm -rf ${percona_install_dir}
-    rm -rf percona-server-${percona_5_5_version}
+    rm -rf percona-server-${percona55_version}
     echo "${CFAILURE}Percona install failed, Please contact the author! ${CEND}"
     kill -9 $$
   fi

include/percona-5.6.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_Percona-5-6() {
+Install_Percona56() {
   pushd ${oneinstack_dir}/src
 
   id -u mysql >/dev/null 2>&1
@@ -18,13 +18,13 @@ Install_Percona-5-6() {
   mkdir -p ${percona_data_dir};chown mysql.mysql -R ${percona_data_dir}
 
   if [ "${dbInstallMethods}" == "1" ]; then
-    perconaVerStr1=$(echo ${percona_5_6_version} | sed "s@-@-rel@")
+    perconaVerStr1=$(echo ${percona56_version} | sed "s@-@-rel@")
     tar xvf Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
     mv Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${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
   elif [ "${dbInstallMethods}" == "2" ]; then
-    tar xvf percona-server-${percona_5_6_version}.tar.gz
-    pushd percona-server-${percona_5_6_version}
+    tar xvf percona-server-${percona56_version}.tar.gz
+    pushd percona-server-${percona56_version}
     cmake . -DCMAKE_INSTALL_PREFIX=${percona_install_dir} \
     -DMYSQL_DATADIR=${percona_data_dir} \
     -DSYSCONFDIR=/etc \
@@ -51,11 +51,11 @@ Install_Percona-5-6() {
     if [ "${dbInstallMethods}" == "1" ]; then
       rm -rf Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}
     elif [ "${dbInstallMethods}" == "2" ]; then
-      rm -rf percona-server-${percona_5_6_version}
+      rm -rf percona-server-${percona56_version}
     fi
   else
     rm -rf ${percona_install_dir}
-    rm -rf percona-server-${percona_5_6_version}
+    rm -rf percona-server-${percona56_version}
     echo "${CFAILURE}Percona install failed, Please contact the author! ${CEND}"
     kill -9 $$
   fi

include/percona-5.7.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_Percona-5-7() {
+Install_Percona57() {
   pushd ${oneinstack_dir}/src
 
   id -u mysql >/dev/null 2>&1
@@ -18,12 +18,12 @@ Install_Percona-5-7() {
   mkdir -p ${percona_data_dir};chown mysql.mysql -R ${percona_data_dir}
 
   if [ "${dbInstallMethods}" == "1" ]; then
-    tar xvf Percona-Server-${percona_5_7_version}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
-    mv Percona-Server-${percona_5_7_version}-Linux.${SYS_BIT_b}.${sslLibVer}/* ${percona_install_dir}
+    tar xvf Percona-Server-${percona57_version}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
+    mv Percona-Server-${percona57_version}-Linux.${SYS_BIT_b}.${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
   elif [ "${dbInstallMethods}" == "2" ]; then
-    tar xvf percona-server-${percona_5_7_version}.tar.gz
-    pushd percona-server-${percona_5_7_version}
+    tar xvf percona-server-${percona57_version}.tar.gz
+    pushd percona-server-${percona57_version}
     cmake . -DCMAKE_INSTALL_PREFIX=${percona_install_dir} \
     -DMYSQL_DATADIR=${percona_data_dir} \
     -DSYSCONFDIR=/etc \
@@ -49,13 +49,13 @@ Install_Percona-5-7() {
   if [ -d "${percona_install_dir}/support-files" ]; then
     echo "${CSUCCESS}Percona installed successfully! ${CEND}"
     if [ "${dbInstallMethods}" == "1" ]; then
-      rm -rf Percona-Server-${percona_5_7_version}-Linux.${SYS_BIT_b}.${sslLibVer}
+      rm -rf Percona-Server-${percona57_version}-Linux.${SYS_BIT_b}.${sslLibVer}
     elif [ "${dbInstallMethods}" == "2" ]; then
-      rm -rf percona-server-${percona_5_7_version}
+      rm -rf percona-server-${percona57_version}
     fi
   else
     rm -rf ${percona_install_dir}
-    rm -rf percona-server-${percona_5_7_version}
+    rm -rf percona-server-${percona57_version}
     echo "${CFAILURE}Percona install failed, Please contact the author! ${CEND}"
     kill -9 $$
   fi

include/php-5.3.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_PHP-5-3() {
+Install_PHP53() {
   pushd ${oneinstack_dir}/src
   
   tar xzf libiconv-$libiconv_version.tar.gz
@@ -82,9 +82,9 @@ Install_PHP-5-3() {
   id -u $run_user >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin $run_user
   
-  tar xzf php-$php_3_version.tar.gz
-  patch -d php-$php_3_version -p0 < fpm-race-condition.patch
-  pushd php-$php_3_version
+  tar xzf php-$php53_version.tar.gz
+  patch -d php-$php53_version -p0 < fpm-race-condition.patch
+  pushd php-$php53_version
   patch -p1 < ../php5.3patch
   patch -p1 < ../debian_patches_disable_SSLv2_for_openssl_1_0_0.patch
   make clean
@@ -246,6 +246,6 @@ EOF
     service httpd restart
   fi
   popd
-  [ -e "$php_install_dir/bin/phpize" ] && rm -rf php-$php_3_version
+  [ -e "$php_install_dir/bin/phpize" ] && rm -rf php-$php53_version
   popd
 }

include/php-5.4.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_PHP-5-4() {
+Install_PHP54() {
   pushd ${oneinstack_dir}/src
   
   tar xzf libiconv-$libiconv_version.tar.gz
@@ -59,9 +59,9 @@ Install_PHP-5-4() {
   id -u $run_user >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin $run_user
   
-  tar xzf php-$php_4_version.tar.gz
-  patch -d php-$php_4_version -p0 < fpm-race-condition.patch
-  pushd php-$php_4_version
+  tar xzf php-$php54_version.tar.gz
+  patch -d php-$php54_version -p0 < fpm-race-condition.patch
+  pushd php-$php54_version
   make clean
   [ ! -d "$php_install_dir" ] && mkdir -p $php_install_dir
   if [[ $Apache_version =~ ^[1-2]$ ]] || [ -e "$apache_install_dir/bin/apxs" ]; then
@@ -220,6 +220,6 @@ EOF
     service httpd restart
   fi
   popd
-  [ -e "$php_install_dir/bin/phpize" ] && rm -rf php-$php_4_version
+  [ -e "$php_install_dir/bin/phpize" ] && rm -rf php-$php54_version
   popd
 }

include/php-5.5.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_PHP-5-5() {
+Install_PHP55() {
   pushd ${oneinstack_dir}/src
   
   tar xzf libiconv-$libiconv_version.tar.gz
@@ -58,9 +58,9 @@ Install_PHP-5-5() {
   
   id -u $run_user >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin $run_user
-  tar xzf php-$php_5_version.tar.gz
-  patch -d php-$php_5_version -p0 < fpm-race-condition.patch
-  pushd php-$php_5_version
+  tar xzf php-$php55_version.tar.gz
+  patch -d php-$php55_version -p0 < fpm-race-condition.patch
+  pushd php-$php55_version
   [ ! -d "$php_install_dir" ] && mkdir -p $php_install_dir
   [ "$PHP_cache" == '1' ] && PHP_cache_tmp='--enable-opcache' || PHP_cache_tmp='--disable-opcache'
   if [[ $Apache_version =~ ^[1-2]$ ]] || [ -e "$apache_install_dir/bin/apxs" ]; then
@@ -233,6 +233,6 @@ EOF
     service httpd restart
   fi
   popd
-  [ -e "$php_install_dir/bin/phpize" ] && rm -rf php-$php_5_version
+  [ -e "$php_install_dir/bin/phpize" ] && rm -rf php-$php55_version
   popd
 }

include/php-5.6.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_PHP-5-6() {
+Install_PHP56() {
   pushd ${oneinstack_dir}/src
   
   tar xzf libiconv-$libiconv_version.tar.gz
@@ -59,8 +59,8 @@ Install_PHP-5-6() {
   id -u $run_user >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin $run_user
   
-  tar xzf php-$php_6_version.tar.gz
-  pushd php-$php_6_version
+  tar xzf php-$php56_version.tar.gz
+  pushd php-$php56_version
   make clean
   [ ! -d "$php_install_dir" ] && mkdir -p $php_install_dir
   [ "$PHP_cache" == '1' ] && PHP_cache_tmp='--enable-opcache' || PHP_cache_tmp='--disable-opcache'
@@ -234,6 +234,6 @@ EOF
     service httpd restart
   fi
   popd
-  [ -e "$php_install_dir/bin/phpize" ] && rm -rf php-$php_6_version
+  [ -e "$php_install_dir/bin/phpize" ] && rm -rf php-$php56_version
   popd
 }

include/php-7.0.sh

@@ -8,7 +8,7 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_PHP-7-0() {
+Install_PHP70() {
   pushd ${oneinstack_dir}/src
   
   tar xzf libiconv-$libiconv_version.tar.gz
@@ -59,8 +59,8 @@ Install_PHP-7-0() {
   id -u $run_user >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin $run_user
   
-  tar xzf php-$php_7_version.tar.gz
-  pushd php-$php_7_version
+  tar xzf php-$php70_version.tar.gz
+  pushd php-$php70_version
   make clean
   ./buildconf
   [ ! -d "$php_install_dir" ] && mkdir -p $php_install_dir
@@ -240,6 +240,6 @@ EOF
     service httpd restart
   fi
   popd
-  [ -e "$php_install_dir/bin/phpize" ] && rm -rf php-$php_7_version
+  [ -e "$php_install_dir/bin/phpize" ] && rm -rf php-$php70_version
   popd
 }

include/tengine.sh

@@ -25,7 +25,7 @@ Install_Tengine() {
   sed -i 's@CFLAGS="$CFLAGS -g"@#CFLAGS="$CFLAGS -g"@' auto/cc/gcc
   
   [ ! -d "$tengine_install_dir" ] && mkdir -p $tengine_install_dir
-  ./configure --prefix=$tengine_install_dir --user=$run_user --group=$run_user --with-http_stub_status_module --with-http_v2_module --with-http_ssl_module --with-ipv6 --with-http_gzip_static_module --with-http_realip_module --with-http_flv_module --with-http_mp4_module --with-http_concat_module=shared --with-http_sysguard_module=shared --with-openssl=../openssl-$openssl_version --with-pcre=../pcre-$pcre_version --with-pcre-jit --with-jemalloc
+  ./configure --prefix=$tengine_install_dir --user=$run_user --group=$run_user --with-http_v2_module --with-http_ssl_module --with-ipv6 --with-http_gzip_static_module --with-http_realip_module --with-http_flv_module --with-http_mp4_module --with-http_concat_module=shared --with-http_sysguard_module=shared --with-openssl=../openssl-$openssl_version --with-pcre=../pcre-$pcre_version --with-pcre-jit --with-jemalloc
   make -j ${THREAD} && make install
   if [ -e "$tengine_install_dir/conf/nginx.conf" ]; then
     popd

include/tomcat-6.sh

@@ -8,16 +8,16 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_tomcat-6() {
+Install_Tomcat6() {
   pushd ${oneinstack_dir}/src
   . /etc/profile
 
   id -u ${run_user} >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /bin/bash ${run_user} || { [ -z "$(grep ^${run_user} /etc/passwd | grep '/bin/bash')" ] && usermod -s /bin/bash ${run_user}; }
 
-  tar xzf apache-tomcat-${tomcat_6_version}.tar.gz
+  tar xzf apache-tomcat-${tomcat6_version}.tar.gz
   [ ! -d "${tomcat_install_dir}" ] && mkdir -p ${tomcat_install_dir}
-  /bin/cp -R apache-tomcat-${tomcat_6_version}/* ${tomcat_install_dir}
+  /bin/cp -R apache-tomcat-${tomcat6_version}/* ${tomcat_install_dir}
   rm -rf ${tomcat_install_dir}/webapps/{docs,examples,host-manager,manager,ROOT/*}
 
   if [ ! -e "${tomcat_install_dir}/conf/server.xml" ]; then
@@ -81,7 +81,7 @@ EOF
 
     [ ! -d "${tomcat_install_dir}/conf/vhost" ] && mkdir ${tomcat_install_dir}/conf/vhost
     cat > ${tomcat_install_dir}/conf/vhost/localhost.xml << EOF
-<Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true">
+<Host name="localhost" appBase="${wwwroot_dir}/default" unpackWARs="true" autoDeploy="true">
   <Context path="" docBase="${wwwroot_dir}/default" debug="0" reloadable="false" crossContext="true"/>
   <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
     prefix="localhost_access_log." suffix=".txt" pattern="%h %l %u %t &quot;%r&quot; %s %b" />
@@ -118,7 +118,7 @@ EOF
     [ "${OS}" == "CentOS" ] && { chkconfig --add tomcat; chkconfig tomcat on; }
     [[ "${OS}" =~ ^Ubuntu$|^Debian$ ]] && update-rc.d tomcat defaults
     echo "${CSUCCESS}Tomcat installed successfully! ${CEND}"
-    rm -rf apache-tomcat-${tomcat_6_version}
+    rm -rf apache-tomcat-${tomcat6_version}
   else
     popd
     echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}"

include/tomcat-7.sh

@@ -8,16 +8,16 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_tomcat-7() {
+Install_Tomcat7() {
   pushd ${oneinstack_dir}/src
   . /etc/profile
 
   id -u ${run_user} >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /bin/bash ${run_user} || { [ -z "$(grep ^${run_user} /etc/passwd | grep '/bin/bash')" ] && usermod -s /bin/bash ${run_user}; }
 
-  tar xzf apache-tomcat-${tomcat_7_version}.tar.gz
+  tar xzf apache-tomcat-${tomcat7_version}.tar.gz
   [ ! -d "${tomcat_install_dir}" ] && mkdir -p ${tomcat_install_dir}
-  /bin/cp -R apache-tomcat-${tomcat_7_version}/* ${tomcat_install_dir}
+  /bin/cp -R apache-tomcat-${tomcat7_version}/* ${tomcat_install_dir}
   rm -rf ${tomcat_install_dir}/webapps/{docs,examples,host-manager,manager,ROOT/*}
 
   if [ ! -e "${tomcat_install_dir}/conf/server.xml" ]; then
@@ -81,7 +81,7 @@ EOF
 
     [ ! -d "${tomcat_install_dir}/conf/vhost" ] && mkdir ${tomcat_install_dir}/conf/vhost
     cat > ${tomcat_install_dir}/conf/vhost/localhost.xml << EOF
-<Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true">
+<Host name="localhost" appBase="${wwwroot_dir}/default" unpackWARs="true" autoDeploy="true">
   <Context path="" docBase="${wwwroot_dir}/default" debug="0" reloadable="false" crossContext="true"/>
   <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
     prefix="localhost_access_log." suffix=".txt" pattern="%h %l %u %t &quot;%r&quot; %s %b" />
@@ -118,7 +118,7 @@ EOF
     [ "${OS}" == "CentOS" ] && { chkconfig --add tomcat; chkconfig tomcat on; }
     [[ "${OS}" =~ ^Ubuntu$|^Debian$ ]] && update-rc.d tomcat defaults
     echo "${CSUCCESS}Tomcat installed successfully! ${CEND}"
-    rm -rf apache-tomcat-${tomcat_7_version}
+    rm -rf apache-tomcat-${tomcat7_version}
   else
     popd
     echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}"

include/tomcat-8.sh

@@ -8,16 +8,16 @@
 #       https://oneinstack.com
 #       https://github.com/lj2007331/oneinstack
 
-Install_tomcat-8() {
+Install_Tomcat8() {
   pushd ${oneinstack_dir}/src
   . /etc/profile
 
   id -u ${run_user} >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /bin/bash ${run_user} || { [ -z "$(grep ^${run_user} /etc/passwd | grep '/bin/bash')" ] && usermod -s /bin/bash ${run_user}; }
 
-  tar xzf apache-tomcat-${tomcat_8_version}.tar.gz
+  tar xzf apache-tomcat-${tomcat8_version}.tar.gz
   [ ! -d "${tomcat_install_dir}" ] && mkdir -p ${tomcat_install_dir}
-  /bin/cp -R apache-tomcat-${tomcat_8_version}/* ${tomcat_install_dir}
+  /bin/cp -R apache-tomcat-${tomcat8_version}/* ${tomcat_install_dir}
   rm -rf ${tomcat_install_dir}/webapps/{docs,examples,host-manager,manager,ROOT/*}
 
   if [ ! -e "${tomcat_install_dir}/conf/server.xml" ]; then
@@ -81,7 +81,7 @@ EOF
 
     [ ! -d "${tomcat_install_dir}/conf/vhost" ] && mkdir ${tomcat_install_dir}/conf/vhost
     cat > ${tomcat_install_dir}/conf/vhost/localhost.xml << EOF
-<Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true">
+<Host name="localhost" appBase="${wwwroot_dir}/default" unpackWARs="true" autoDeploy="true">
   <Context path="" docBase="${wwwroot_dir}/default" debug="0" reloadable="false" crossContext="true"/>
   <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
     prefix="localhost_access_log." suffix=".txt" pattern="%h %l %u %t &quot;%r&quot; %s %b" />
@@ -118,7 +118,7 @@ EOF
     [ "${OS}" == "CentOS" ] && { chkconfig --add tomcat; chkconfig tomcat on; }
     [[ "${OS}" =~ ^Ubuntu$|^Debian$ ]] && update-rc.d tomcat defaults
     echo "${CSUCCESS}Tomcat installed successfully! ${CEND}"
-    rm -rf apache-tomcat-${tomcat_8_version}
+    rm -rf apache-tomcat-${tomcat8_version}
   else
     popd
     echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}"

install.sh

@@ -489,7 +489,7 @@ installDepsBySrc 2>&1 | tee -a ${oneinstack_dir}/install.log
 if [[ $Nginx_version =~ ^[1-3]$ ]] || [ "$DB_yn" == 'y' -a "$DB_version" != '10' ]; then
   if [ ! -e "/usr/local/lib/libjemalloc.so" ]; then
     . include/jemalloc.sh
-    Install_jemalloc | tee -a $oneinstack_dir/install.log
+    Install_Jemalloc | tee -a $oneinstack_dir/install.log
   fi
 fi
 
@@ -501,15 +501,15 @@ case "${DB_version}" in
       installBoost 2>&1 | tee -a ${oneinstack_dir}/install.log
     fi
     . include/mysql-5.7.sh
-    Install_MySQL-5-7 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_MySQL57 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   2)
     . include/mysql-5.6.sh
-    Install_MySQL-5-6 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_MySQL56 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   3)
     . include/mysql-5.5.sh
-    Install_MySQL-5-5 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_MySQL55 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   4)
     if [ "${dbInstallMethods}" == "2" ]; then
@@ -517,15 +517,15 @@ case "${DB_version}" in
       installBoost 2>&1 | tee -a ${oneinstack_dir}/install.log
     fi
     . include/mariadb-10.1.sh
-    Install_MariaDB-10-1 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_MariaDB101 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   5)
     . include/mariadb-10.0.sh
-    Install_MariaDB-10-0 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_MariaDB100 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   6)
     . include/mariadb-5.5.sh
-    Install_MariaDB-5-5 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_MariaDB55 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   7)
     if [ "${dbInstallMethods}" == "2" ]; then
@@ -533,52 +533,52 @@ case "${DB_version}" in
       installBoost 2>&1 | tee -a ${oneinstack_dir}/install.log
     fi
     . include/percona-5.7.sh
-    Install_Percona-5-7 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_Percona57 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   8)
     . include/percona-5.6.sh
-    Install_Percona-5-6 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_Percona56 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   9)
     . include/percona-5.5.sh
-    Install_Percona-5-5 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_Percona55 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   10)
     . include/alisql-5.6.sh
-    Install_AliSQL-5-6 2>&1 | tee -a $oneinstack_dir/install.log
+    Install_AliSQL56 2>&1 | tee -a $oneinstack_dir/install.log
     ;;
 esac
 
 # Apache
 if [ "$Apache_version" == '1' ]; then
   . include/apache-2.4.sh
-  Install_Apache-2-4 2>&1 | tee -a $oneinstack_dir/install.log
+  Install_Apache24 2>&1 | tee -a $oneinstack_dir/install.log
 elif [ "$Apache_version" == '2' ]; then
   . include/apache-2.2.sh
-  Install_Apache-2-2 2>&1 | tee -a $oneinstack_dir/install.log
+  Install_Apache22 2>&1 | tee -a $oneinstack_dir/install.log
 fi
 
 # PHP
 case "${PHP_version}" in
   1)
     . include/php-5.3.sh
-    Install_PHP-5-3 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_PHP53 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   2)
     . include/php-5.4.sh
-    Install_PHP-5-4 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_PHP54 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   3)
     . include/php-5.5.sh
-    Install_PHP-5-5 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_PHP55 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   4)
     . include/php-5.6.sh
-    Install_PHP-5-6 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_PHP56 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   5)
     . include/php-7.0.sh
-    Install_PHP-7-0 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_PHP70 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
 esac
 
@@ -649,30 +649,30 @@ esac
 case "${JDK_version}" in
   1)
     . include/jdk-1.8.sh
-    Install-JDK-1-8 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install-JDK18 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   2)
     . include/jdk-1.7.sh
-    Install-JDK-1-7 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install-JDK17 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   3)
     . include/jdk-1.6.sh
-    Install-JDK-1-6 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install-JDK16 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
 esac
 
 case "${Tomcat_version}" in
   1)
     . include/tomcat-8.sh
-    Install_tomcat-8 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_Tomcat8 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   2)
     . include/tomcat-7.sh
-    Install_tomcat-7 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_Tomcat7 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   3)
     . include/tomcat-6.sh
-    Install_tomcat-6 2>&1 | tee -a ${oneinstack_dir}/install.log
+    Install_Tomcat6 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
 esac
 

versions.txt

@@ -5,42 +5,43 @@ tengine_version=2.1.2
 openresty_version=1.11.2.2
 openssl_version=1.0.2j
 
-tomcat_8_version=8.0.30
-tomcat_7_version=7.0.69
-tomcat_6_version=6.0.45
+tomcat8_version=8.0.30
+tomcat7_version=7.0.69
+tomcat6_version=6.0.45
 
-apache_4_version=2.4.23
-apache_2_version=2.2.31
+apache24_version=2.4.23
+apache22_version=2.2.31
 pcre_version=8.39
 apr_version=1.5.2
 apr_util_version=1.5.4
 
 # DB
-mysql_5_7_version=5.7.16
-mysql_5_6_version=5.6.34
-mysql_5_5_version=5.5.53
+mysql57_version=5.7.16
+mysql56_version=5.6.34
+mysql55_version=5.5.53
 
-mariadb_10_1_version=10.1.19
-mariadb_10_0_version=10.0.28
-mariadb_5_5_version=5.5.53
+mariadb101_version=10.1.19
+mariadb100_version=10.0.28
+mariadb55_version=5.5.53
 
-percona_5_7_version=5.7.15-9
-percona_5_6_version=5.6.33-79.0
-percona_5_5_version=5.5.53-38.5
+percona57_version=5.7.16-10
+percona56_version=5.6.34-79.1
+percona55_version=5.5.53-38.5
 
-alisql_5_6_version=5.6.32-2
+alisql56_version=5.6.32-2
 
 # JDK
-jdk_8_version=1.8.0_112
-jdk_7_version=1.7.0_80
-jdk_6_version=1.6.0_45
+jdk18_version=1.8.0_112
+jdk17_version=1.7.0_80
+jdk16_version=1.6.0_45
 
 # PHP
-php_7_version=7.0.13
-php_6_version=5.6.28
-php_5_version=5.5.38
-php_4_version=5.4.45
-php_3_version=5.3.29
+php71_version=7.1.0
+php70_version=7.0.13
+php56_version=5.6.28
+php55_version=5.5.38
+php54_version=5.4.45
+php53_version=5.3.29
 
 zendopcache_version=7.0.5
 xcache_version=3.2.0
@@ -88,5 +89,5 @@ tmux_version=2.2
 htop_version=2.0.2
 bison_version=2.7.1
 python_version=2.7.12
-setuptools_version=28.8.0 
+setuptools_version=30.0.0
 pip_version=9.0.1

vhost.sh

@@ -503,10 +503,10 @@ EOF
   [ "${https_yn}" == 'y' ] && sed -i "s@^root.*;@&\nif (\$ssl_protocol = \"\") { return 301 https://\$host\$request_uri; }@" ${web_install_dir}/conf/vhost/${domain}.conf
 
   cat > ${tomcat_install_dir}/conf/vhost/${domain}.xml << EOF
-<Host name="${domain}" appBase="webapps" unpackWARs="true" autoDeploy="true"> ${Tomcat_Domain_alias}
+<Host name="${domain}" appBase="${vhostdir}" unpackWARs="true" autoDeploy="true"> ${Tomcat_Domain_alias}
   <Context path="" docBase="${vhostdir}" debug="0" reloadable="false" crossContext="true"/>
   <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
-         prefix="${domain}_access_log." suffix=".txt" pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+    prefix="${domain}_access_log." suffix=".txt" pattern="%h %l %u %t &quot;%r&quot; %s %b" />
 </Host>
 EOF
   [ -z "$(grep -o "vhost-${domain} SYSTEM" ${tomcat_install_dir}/conf/server.xml)" ] && sed -i "/vhost-localhost SYSTEM/a<\!ENTITY vhost-${domain} SYSTEM \"file://${tomcat_install_dir}/conf/vhost/${domain}.xml\">" ${tomcat_install_dir}/conf/server.xml