Browse Source

[feat] Update versions.txt and Add lsb_release -a

lj2007331@gmail.com 5 years ago
parent
commit
f18f85d51b

+ 1 - 1
include/GraphicsMagick.sh

@@ -51,7 +51,7 @@ Install_pecl_gmagick() {
       echo "${CSUCCESS}PHP gmagick module installed successfully! ${CEND}"
       rm -rf gmagick-${gmagick_ver} gmagick-${gmagick_oldver}
     else
-      echo "${CFAILURE}PHP gmagick module install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}PHP gmagick module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi
     popd > /dev/null
   fi

+ 1 - 1
include/ImageMagick.sh

@@ -46,7 +46,7 @@ Install_pecl_imagick() {
       echo "${CSUCCESS}PHP imagick module installed successfully! ${CEND}"
       rm -rf imagick-${imagick_ver}
     else
-      echo "${CFAILURE}PHP imagick module install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}PHP imagick module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi
     popd > /dev/null
   fi

+ 1 - 1
include/alisql-5.6.sh

@@ -43,7 +43,7 @@ Install_AliSQL56() {
   else
     rm -rf ${alisql_install_dir}
     rm -rf alisql-${alisql_ver}
-    echo "${CFAILURE}AliSQL install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}AliSQL install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
   /bin/cp ${alisql_install_dir}/support-files/mysql.server /etc/init.d/mysqld

+ 1 - 1
include/apache-2.2.sh

@@ -25,7 +25,7 @@ Install_Apache22() {
     rm -rf httpd-${apache22_ver}
   else
     rm -rf ${apache_install_dir}
-    echo "${CFAILURE}Apache install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Apache install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 

+ 1 - 1
include/apache-2.4.sh

@@ -62,7 +62,7 @@ Install_Apache24() {
     rm -rf httpd-${apache24_ver} pcre-${pcre_ver}
   else
     rm -rf ${apache_install_dir}
-    echo "${CFAILURE}Apache install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Apache install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 

+ 1 - 1
include/apcu.sh

@@ -36,7 +36,7 @@ EOF
       echo "${CSUCCESS}PHP apcu module installed successfully! ${CEND}"
       rm -rf apcu-${apcu_ver} apcu-${apcu_oldver} package.xml
     else
-      echo "${CFAILURE}PHP apcu module install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}PHP apcu module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi
     popd > /dev/null
   fi

+ 1 - 1
include/eaccelerator.sh

@@ -54,7 +54,7 @@ EOF
         echo "${CSUCCESS}PHP eaccelerator module installed successfully! ${CEND}"
         rm -rf eaccelerator-${eaccelerator_ver} eaccelerator-eaccelerator-42067ac
       else
-        echo "${CFAILURE}PHP eaccelerator module install failed, Please contact the author! ${CEND}"
+        echo "${CFAILURE}PHP eaccelerator module install failed, Please contact the author! ${CEND}" && lsb_release -a
       fi
     else
       echo; echo "${CWARNING}Your php ${PHP_detail_ver} does not support eAccelerator! ${CEND}";

+ 1 - 1
include/jdk-1.6.sh

@@ -28,7 +28,7 @@ Install_JDK16() {
     rm -rf ${JDK_NAME}
     echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
   else
-    echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
   popd

+ 1 - 1
include/jdk-1.7.sh

@@ -27,7 +27,7 @@ Install_JDK17() {
     echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
   else
     rm -rf $JAVA_dir
-    echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
   popd

+ 1 - 1
include/jdk-1.8.sh

@@ -26,7 +26,7 @@ Install_JDK18() {
     . /etc/profile
     echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
   else
-    echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
   popd

+ 1 - 1
include/jdk-11.0.sh

@@ -26,7 +26,7 @@ Install_JDK110() {
     . /etc/profile
     echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
   else
-    echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
   popd

+ 1 - 1
include/jemalloc.sh

@@ -27,7 +27,7 @@ Install_Jemalloc() {
       echo "${CSUCCESS}jemalloc module installed successfully! ${CEND}"
       rm -rf jemalloc-${jemalloc_ver}
     else
-      echo "${CFAILURE}jemalloc install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}jemalloc install failed, Please contact the author! ${CEND}" && lsb_release -a
       kill -9 $$
     fi
     popd > /dev/null

+ 2 - 2
include/mariadb-10.2.sh

@@ -22,7 +22,7 @@ Install_MariaDB102() {
     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
-    boostVersion2=$(echo ${boost_ver} | awk -F. '{print $1"_"$2"_"$3}')
+    boostVersion2=$(echo ${boost_oldver} | awk -F. '{print $1"_"$2"_"$3}')
     tar xzf boost_${boostVersion2}.tar.gz
     tar xzf mariadb-${mariadb102_ver}.tar.gz
     pushd mariadb-${mariadb102_ver}
@@ -58,7 +58,7 @@ Install_MariaDB102() {
     fi
   else
     rm -rf ${mariadb_install_dir}
-    echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 

+ 2 - 2
include/mariadb-10.3.sh

@@ -22,7 +22,7 @@ Install_MariaDB103() {
     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
-    boostVersion2=$(echo ${boost_ver} | awk -F. '{print $1"_"$2"_"$3}')
+    boostVersion2=$(echo ${boost_oldver} | awk -F. '{print $1"_"$2"_"$3}')
     tar xzf boost_${boostVersion2}.tar.gz
     tar xzf mariadb-${mariadb103_ver}.tar.gz
     pushd mariadb-${mariadb103_ver}
@@ -58,7 +58,7 @@ Install_MariaDB103() {
     fi
   else
     rm -rf ${mariadb_install_dir}
-    echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 

+ 2 - 2
include/mariadb-10.4.sh

@@ -22,7 +22,7 @@ Install_MariaDB104() {
     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
-    boostVersion2=$(echo ${boost_ver} | awk -F. '{print $1"_"$2"_"$3}')
+    boostVersion2=$(echo ${boost_oldver} | awk -F. '{print $1"_"$2"_"$3}')
     tar xzf boost_${boostVersion2}.tar.gz
     tar xzf mariadb-${mariadb104_ver}.tar.gz
     pushd mariadb-${mariadb104_ver}
@@ -58,7 +58,7 @@ Install_MariaDB104() {
     fi
   else
     rm -rf ${mariadb_install_dir}
-    echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 

+ 1 - 1
include/mariadb-5.5.sh

@@ -56,7 +56,7 @@ Install_MariaDB55() {
     fi
   else
     rm -rf ${mariadb_install_dir}
-    echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 

+ 3 - 3
include/memcached.sh

@@ -35,7 +35,7 @@ Install_memcached_server() {
     rm -rf memcached-${memcached_ver}
   else
     rm -rf ${memcached_install_dir}
-    echo "${CFAILURE}memcached-server install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}memcached-server install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
   popd > /dev/null
@@ -65,7 +65,7 @@ Install_pecl_memcache() {
       echo "${CSUCCESS}PHP memcache module installed successfully! ${CEND}"
       rm -rf pecl-memcache-${pecl_memcache_ver} memcache-${pecl_memcache_oldver}
     else
-      echo "${CFAILURE}PHP memcache module install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}PHP memcache module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi
     popd > /dev/null
   fi
@@ -105,7 +105,7 @@ EOF
       echo "${CSUCCESS}PHP memcached module installed successfully! ${CEND}"
       rm -rf memcached-${pecl_memcached_oldver} memcached-${pecl_memcached_ver}
     else
-      echo "${CFAILURE}PHP memcached module install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}PHP memcached module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi
     popd > /dev/null
   fi

+ 1 - 1
include/mongodb.sh

@@ -74,7 +74,7 @@ EOF
     rm -rf mongodb-linux-${SYS_BIT_b}-${mongodb_ver}
   else
     rm -rf ${mongo_install_dir} ${mongo_data_dir}
-    echo "${CFAILURE}MongoDB install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}MongoDB install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
   popd

+ 1 - 1
include/mysql-5.5.sh

@@ -56,7 +56,7 @@ Install_MySQL55() {
     fi
   else
     rm -rf ${mysql_install_dir}
-    echo "${CFAILURE}MySQL install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}MySQL install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 

+ 1 - 1
include/mysql-5.6.sh

@@ -54,7 +54,7 @@ Install_MySQL56() {
     fi
   else
     rm -rf ${mysql_install_dir}
-    echo "${CFAILURE}MySQL install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}MySQL install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 

+ 2 - 2
include/mysql-5.7.sh

@@ -22,7 +22,7 @@ Install_MySQL57() {
     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
-    boostVersion2=$(echo ${boost_ver} | awk -F. '{print $1"_"$2"_"$3}')
+    boostVersion2=$(echo ${boost_oldver} | awk -F. '{print $1"_"$2"_"$3}')
     tar xzf boost_${boostVersion2}.tar.gz
     tar xzf mysql-${mysql57_ver}.tar.gz
     pushd mysql-${mysql57_ver}
@@ -58,7 +58,7 @@ Install_MySQL57() {
     fi
   else
     rm -rf ${mysql_install_dir}
-    echo "${CFAILURE}MySQL install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}MySQL install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 

+ 3 - 3
include/mysql-8.0.sh

@@ -48,8 +48,8 @@ Install_MySQL80() {
   fi
 
   # backup openssl so
-  [ ! -e "${mysql_install_dir}/lib/lib_bk" ] && mkdir ${mysql_install_dir}/lib/lib_bk
-  /bin/mv ${mysql_install_dir}/lib/{libssl,libcrypto}.so* ${mysql_install_dir}/lib/lib_bk/
+  #[ ! -e "${mysql_install_dir}/lib/lib_bk" ] && mkdir ${mysql_install_dir}/lib/lib_bk
+  #/bin/mv ${mysql_install_dir}/lib/{libssl,libcrypto}.so* ${mysql_install_dir}/lib/lib_bk/
 
   if [ -d "${mysql_install_dir}/support-files" ]; then
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mysql_install_dir}/bin/mysqld_safe
@@ -62,7 +62,7 @@ Install_MySQL80() {
     fi
   else
     rm -rf ${mysql_install_dir}
-    echo "${CFAILURE}MySQL install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}MySQL install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 

+ 1 - 1
include/openssl.sh

@@ -25,7 +25,7 @@ Install_openSSL() {
       /bin/cp cacert.pem ${openssl_install_dir}/cert.pem
       rm -rf openssl-${openssl_ver}
     else
-      echo "${CFAILURE}openSSL install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}openSSL install failed, Please contact the author! ${CEND}" && lsb_release -a
       kill -9 $$
     fi
     popd > /dev/null

+ 1 - 1
include/pecl_calendar.sh

@@ -25,7 +25,7 @@ Install_pecl_calendar() {
       echo "${CSUCCESS}PHP calendar module installed successfully! ${CEND}"
       rm -rf php-${PHP_detail_ver}
     else
-      echo "${CFAILURE}PHP calendar module install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}PHP calendar module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi
     popd > /dev/null
   fi

+ 1 - 1
include/pecl_fileinfo.sh

@@ -25,7 +25,7 @@ Install_pecl_fileinfo() {
       echo "${CSUCCESS}PHP fileinfo module installed successfully! ${CEND}"
       rm -rf php-${PHP_detail_ver}
     else
-      echo "${CFAILURE}PHP fileinfo module install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}PHP fileinfo module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi
     popd > /dev/null
   fi

+ 1 - 1
include/pecl_imap.sh

@@ -31,7 +31,7 @@ Install_pecl_imap() {
       echo "${CSUCCESS}PHP imap module installed successfully! ${CEND}"
       rm -rf php-${PHP_detail_ver}
     else
-      echo "${CFAILURE}PHP imap module install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}PHP imap module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi
     popd > /dev/null
   fi

+ 1 - 1
include/pecl_ldap.sh

@@ -33,7 +33,7 @@ Install_pecl_ldap() {
       echo "${CSUCCESS}PHP ldap module installed successfully! ${CEND}"
       rm -rf php-${PHP_detail_ver}
     else
-      echo "${CFAILURE}PHP ldap module install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}PHP ldap module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi
     popd > /dev/null
   fi

+ 2 - 2
include/pecl_mongodb.sh

@@ -25,7 +25,7 @@ Install_pecl_mongodb() {
         rm -rf mongo-${pecl_mongo_ver}
         echo "${CSUCCESS}PHP mongo module installed successfully! ${CEND}"
       else
-        echo "${CFAILURE}PHP mongo module install failed, Please contact the author! ${CEND}"
+        echo "${CFAILURE}PHP mongo module install failed, Please contact the author! ${CEND}" && lsb_release -a
       fi
     else
       src_url=https://pecl.php.net/get/mongodb-${pecl_mongodb_ver}.tgz && Download_src
@@ -40,7 +40,7 @@ Install_pecl_mongodb() {
         echo "${CSUCCESS}PHP mongodb module installed successfully! ${CEND}"
         rm -rf mongodb-${pecl_mongodb_ver}
       else
-        echo "${CFAILURE}PHP mongodb module install failed, Please contact the author! ${CEND}"
+        echo "${CFAILURE}PHP mongodb module install failed, Please contact the author! ${CEND}" && lsb_release -a
       fi
     fi
     popd > /dev/null

+ 1 - 1
include/pecl_pgsql.sh

@@ -30,7 +30,7 @@ Install_pecl_pgsql() {
       echo "${CSUCCESS}PHP pgsql module installed successfully! ${CEND}"
       rm -rf php-${PHP_detail_ver}
     else
-      echo "${CFAILURE}PHP pgsql module install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}PHP pgsql module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi
     popd > /dev/null
   fi

+ 1 - 1
include/pecl_phalcon.sh

@@ -26,7 +26,7 @@ Install_pecl_phalcon() {
         echo "${CSUCCESS}PHP phalcon module installed successfully! ${CEND}"
         rm -rf cphalcon-${phalcon_ver}
       else
-        echo "${CFAILURE}PHP phalcon module install failed, Please contact the author! ${CEND}"
+        echo "${CFAILURE}PHP phalcon module install failed, Please contact the author! ${CEND}" && lsb_release -a
       fi
     else
       echo "${CWARNING}Your php ${PHP_detail_ver} does not support phalcon! ${CEND}";

+ 1 - 1
include/pecl_swoole.sh

@@ -32,7 +32,7 @@ Install_pecl_swoole() {
       echo "${CSUCCESS}PHP swoole module installed successfully! ${CEND}"
       rm -rf swoole-${swoole_ver} swoole-${swoole_oldver}
     else
-      echo "${CFAILURE}PHP swoole module install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}PHP swoole module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi
     popd > /dev/null
   fi

+ 1 - 1
include/pecl_xdebug.sh

@@ -49,7 +49,7 @@ EOF
         echo; echo "Webgrind URL: ${CMSG}http://{Public IP}/webgrind ${CEND}"
         rm -rf xdebug-${xdebug_ver} xdebug-${xdebug_oldver}
       else
-        echo "${CFAILURE}PHP xdebug module install failed, Please contact the author! ${CEND}"
+        echo "${CFAILURE}PHP xdebug module install failed, Please contact the author! ${CEND}" && lsb_release -a
       fi
     else
       echo "${CWARNING}Your php ${PHP_detail_ver} does not support xdebug! ${CEND}";

+ 1 - 1
include/pecl_yaf.sh

@@ -27,7 +27,7 @@ Install_pecl_yaf() {
         echo "${CSUCCESS}PHP yaf module installed successfully! ${CEND}"
         rm -rf yaf-${yaf_ver}
       else
-        echo "${CFAILURE}PHP yaf module install failed, Please contact the author! ${CEND}"
+        echo "${CFAILURE}PHP yaf module install failed, Please contact the author! ${CEND}" && lsb_release -a
       fi
     else
       echo "${CWARNING}Your php ${PHP_detail_ver} does not support yaf! ${CEND}";

+ 1 - 1
include/pecl_yar.sh

@@ -27,7 +27,7 @@ Install_pecl_yar() {
         echo "${CSUCCESS}PHP yar module installed successfully! ${CEND}"
         rm -rf yar-${yar_ver}
       else
-        echo "${CFAILURE}PHP yar module install failed, Please contact the author! ${CEND}"
+        echo "${CFAILURE}PHP yar module install failed, Please contact the author! ${CEND}" && lsb_release -a
       fi
     else
       echo "${CWARNING}Your php ${PHP_detail_ver} does not support yar! ${CEND}";

+ 1 - 1
include/percona-5.5.sh

@@ -57,7 +57,7 @@ Install_Percona55() {
     fi
   else
     rm -rf ${percona_install_dir}
-    echo "${CFAILURE}Percona install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Percona install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 

+ 1 - 1
include/percona-5.6.sh

@@ -56,7 +56,7 @@ Install_Percona56() {
     fi
   else
     rm -rf ${percona_install_dir}
-    echo "${CFAILURE}Percona install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Percona install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 

+ 2 - 2
include/percona-5.7.sh

@@ -22,7 +22,7 @@ Install_Percona57() {
     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-${percona57_ver}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
-    boostVersion2=$(echo ${boost_ver} | awk -F. '{print $1"_"$2"_"$3}')
+    boostVersion2=$(echo ${boost_oldver} | awk -F. '{print $1"_"$2"_"$3}')
     tar xzf boost_${boostVersion2}.tar.gz
     tar xzf percona-server-${percona57_ver}.tar.gz
     pushd percona-server-${percona57_ver}
@@ -60,7 +60,7 @@ Install_Percona57() {
     fi
   else
     rm -rf ${percona_install_dir}
-    echo "${CFAILURE}Percona install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Percona install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 

+ 4 - 4
include/percona-8.0.sh

@@ -23,7 +23,7 @@ Install_Percona80() {
     sed -i "s@/usr/local/Percona-Server-${percona80_ver}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${percona_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
-    boostVersion2=$(echo ${boost_ver} | awk -F. '{print $1"_"$2"_"$3}')
+    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
     pushd percona-server-${percona80_ver}
@@ -50,8 +50,8 @@ Install_Percona80() {
   fi
 
   # backup openssl so
-  [ ! -e "${percona_install_dir}/lib/lib_bk" ] && mkdir ${percona_install_dir}/lib/lib_bk
-  /bin/mv ${percona_install_dir}/lib/{libssl,libcrypto}.so* ${percona_install_dir}/lib/lib_bk/
+  #[ ! -e "${percona_install_dir}/lib/lib_bk" ] && mkdir ${percona_install_dir}/lib/lib_bk
+  #/bin/mv ${percona_install_dir}/lib/{libssl,libcrypto}.so* ${percona_install_dir}/lib/lib_bk/
 
   if [ -d "${percona_install_dir}/support-files" ]; then
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
@@ -63,7 +63,7 @@ Install_Percona80() {
     fi
   else
     rm -rf ${percona_install_dir}
-    echo "${CFAILURE}Percona install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Percona install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 

+ 1 - 1
include/postgresql.sh

@@ -50,7 +50,7 @@ Install_PostgreSQL() {
     echo "${CSUCCESS}PostgreSQL installed successfully! ${CEND}"
   else
     rm -rf ${pgsql_install_dir} ${pgsql_data_dir}
-    echo "${CFAILURE}PostgreSQL install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}PostgreSQL install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
   popd

+ 1 - 1
include/pureftpd.sh

@@ -80,7 +80,7 @@ Install_PureFTPd() {
     rm -rf pure-ftpd-${pureftpd_ver}
   else
     rm -rf ${pureftpd_install_dir}
-    echo "${CFAILURE}Pure-Ftpd install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Pure-Ftpd install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
   popd > /dev/null

+ 2 - 2
include/redis.sh

@@ -51,7 +51,7 @@ Install_redis_server() {
     service redis-server start
   else
     rm -rf ${redis_install_dir}
-    echo "${CFAILURE}Redis-server install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Redis-server install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
   popd > /dev/null
@@ -77,7 +77,7 @@ Install_pecl_redis() {
       echo "${CSUCCESS}PHP Redis module installed successfully! ${CEND}"
       rm -rf redis-${pecl_redis_ver} redis-${pecl_redis_oldver}
     else
-      echo "${CFAILURE}PHP Redis module install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}PHP Redis module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi
     popd > /dev/null
   fi

+ 2 - 2
include/tomcat-6.sh

@@ -31,7 +31,7 @@ Install_Tomcat6() {
 
   if [ ! -e "${tomcat_install_dir}/conf/server.xml" ]; then
     rm -rf ${tomcat_install_dir}
-    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 
@@ -139,7 +139,7 @@ EOF
     rm -rf apache-tomcat-${tomcat6_ver}
   else
     popd > /dev/null
-    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}" && lsb_release -a
   fi
   service tomcat start
   popd > /dev/null

+ 2 - 2
include/tomcat-7.sh

@@ -31,7 +31,7 @@ Install_Tomcat7() {
 
   if [ ! -e "${tomcat_install_dir}/conf/server.xml" ]; then
     rm -rf ${tomcat_install_dir}
-    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 
@@ -139,7 +139,7 @@ EOF
     rm -rf apache-tomcat-${tomcat7_ver}
   else
     popd > /dev/null
-    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}" && lsb_release -a
   fi
   service tomcat start
   popd > /dev/null

+ 2 - 2
include/tomcat-8.sh

@@ -31,7 +31,7 @@ Install_Tomcat8() {
 
   if [ ! -e "${tomcat_install_dir}/conf/server.xml" ]; then
     rm -rf ${tomcat_install_dir}
-    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 
@@ -139,7 +139,7 @@ EOF
     rm -rf apache-tomcat-${tomcat8_ver}
   else
     popd > /dev/null
-    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}" && lsb_release -a
   fi
   service tomcat start
   popd > /dev/null

+ 2 - 2
include/tomcat-9.sh

@@ -31,7 +31,7 @@ Install_Tomcat9() {
 
   if [ ! -e "${tomcat_install_dir}/conf/server.xml" ]; then
     rm -rf ${tomcat_install_dir}
-    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}" && lsb_release -a
     kill -9 $$
   fi
 
@@ -138,7 +138,7 @@ EOF
     rm -rf apache-tomcat-${tomcat9_ver}
   else
     popd > /dev/null
-    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Tomcat install failed, Please contact the author! ${CEND}" && lsb_release -a
   fi
   service tomcat start
   popd > /dev/null

+ 1 - 1
include/xcache.sh

@@ -67,7 +67,7 @@ EOF
         echo "${CSUCCESS}PHP xcache module installed successfully! ${CEND}"
         rm -rf xcache-${xcache_ver}
       else
-        echo "${CFAILURE}PHP xcache module install failed, Please contact the author! ${CEND}"
+        echo "${CFAILURE}PHP xcache module install failed, Please contact the author! ${CEND}" && lsb_release -a
       fi
     else
       echo; echo "${CWARNING}Your php ${PHP_detail_ver} does not support XCache! ${CEND}";

+ 1 - 1
include/zendopcache.sh

@@ -69,7 +69,7 @@ EOF
       echo "${CSUCCESS}PHP opcache module installed successfully! ${CEND}"
       rm -rf php-${PHP_detail_ver}
     else
-      echo "${CFAILURE}PHP opcache module install failed, Please contact the author! ${CEND}"
+      echo "${CFAILURE}PHP opcache module install failed, Please contact the author! ${CEND}" && lsb_release -a
     fi
     popd > /dev/null
   fi

+ 13 - 13
versions.txt

@@ -24,10 +24,10 @@ mysql57_ver=5.7.28
 mysql56_ver=5.6.46
 mysql55_ver=5.5.62
 
-mariadb104_ver=10.4.8
-mariadb103_ver=10.3.18
-mariadb102_ver=10.2.27
-mariadb55_ver=5.5.65
+mariadb104_ver=10.4.10
+mariadb103_ver=10.3.20
+mariadb102_ver=10.2.29
+mariadb55_ver=5.5.66
 
 percona80_ver=8.0.16-7
 percona57_ver=5.7.27-30
@@ -36,13 +36,13 @@ percona55_ver=5.5.62-38.14
 
 alisql_ver=5.6.32-9
 
-pgsql_ver=12.0
+pgsql_ver=12.1
 
 mongodb_ver=4.0.13
 
 # JDK
-jdk110_ver=11.0.4
-jdk18_ver=1.8.0_221
+jdk110_ver=11.0.5
+jdk18_ver=1.8.0_231
 jdk17_ver=1.7.0_80
 jdk16_ver=1.6.0_45
 
@@ -55,10 +55,10 @@ php70_ver=7.0.33
 php71_ver=7.1.33
 php72_ver=7.2.24
 php73_ver=7.3.11
-php74_ver=7.4.0RC5
+php74_ver=7.4.0RC6
 
 libiconv_ver=1.15
-curl_ver=7.66.0
+curl_ver=7.67.0
 libmcrypt_ver=2.5.8
 mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
@@ -66,7 +66,7 @@ freetype_ver=2.10.1
 icu4c_ver=63_1
 libsodium_ver=1.0.18
 argon2_ver=20171227
-imagemagick_ver=7.0.9-2
+imagemagick_ver=7.0.9-4
 imagick_ver=3.4.4
 graphicsmagick_ver=1.3.33
 gmagick_ver=2.0.5RC1
@@ -79,7 +79,7 @@ eaccelerator_ver=0.9.6.1
 phalcon_ver=3.4.3
 yaf_ver=3.0.8
 yar_ver=2.0.5
-swoole_ver=4.4.8
+swoole_ver=4.4.12
 swoole_oldver=1.10.5
 xdebug_ver=2.7.2
 xdebug_oldver=2.5.5
@@ -88,12 +88,12 @@ xdebug_oldver=2.5.5
 pureftpd_ver=1.0.49
 
 # Redis
-redis_ver=5.0.5
+redis_ver=5.0.6
 pecl_redis_ver=5.1.0
 pecl_redis_oldver=4.3.0
 
 # Memcached
-memcached_ver=1.5.19
+memcached_ver=1.5.20
 libmemcached_ver=1.0.18
 pecl_memcached_ver=3.1.4
 pecl_memcached_oldver=2.2.0