Update JDK

README.md

@@ -1,11 +1,11 @@
-This script is written using the shell, in order to quickly deploy `LEMP`/`LAMP`/`LNMP` / `LNMPA`(Linux, Nginx/Tengine, MySQL in a production environment/MariaDB/Percona, PHP, JAVA), applicable to CentOS 5~7(including redhat), Debian 6~8, Ubuntu 12.04~15.04 of 32 and 64.
+This script is written using the shell, in order to quickly deploy `LEMP`/`LAMP`/`LNMP`/`LNMPA`/`LTMP`(Linux, Nginx/Tengine, MySQL in a production environment/MariaDB/Percona, PHP, JAVA), applicable to CentOS 5~7(including redhat), Debian 6~8, Ubuntu 12.04~15.04 of 32 and 64.
 
 Script properties:
 - Continually updated
 - Source compiler installation, most stable source is the latest version, and download from the official site
 - Some security optimization
 - Providing a plurality of database versions (MySQL-5.6, MySQL-5.5, MariaDB-10.0, MariaDB-5.5, Percona-5.6, Percona-5.5)
-- Providing multiple PHP versions (php-5.3, php-5.4, php-5.5, php-5.6, php-7 / phpng (alpha))
+- Providing multiple PHP versions (php-5.3, php-5.4, php-5.5, php-5.6, php-7/phpng(Beta))
 - Provide Nginx, Tengine
 - Providing a plurality of Tomcat version (Tomcat-8, Tomcat-7)
 - Providing a plurality of JDK version (JDK-1.6, JDK-1.7, JDK-1.8)

apps.conf

@@ -2,6 +2,10 @@
 # Web
 nginx_version=1.8.0
 tengine_version=2.1.0
+
+tomcat_7_version=7.0.63
+tomcat_8_version=8.0.24
+
 apache_2_version=2.2.29
 apache_4_version=2.4.12
 pcre_version=8.37
@@ -11,11 +15,18 @@ apr_util_version=1.5.4
 # DB
 mysql_6_version=5.6.25
 mysql_5_version=5.5.44
+
 mariadb_10_version=10.0.20
 mariadb_5_version=5.5.44
+
 percona_6_version=5.6.25-73.0
 percona_5_version=5.5.44-37.3
 
+# JDK
+jdk_6_version=1.6.0_45
+jdk_7_version=1.7.0_80
+jdk_8_version=1.8.0_51
+
 # PHP
 php_3_version=5.3.29
 php_4_version=5.4.43
@@ -35,15 +46,6 @@ libmcrypt_version=2.5.8
 mcrypt_version=2.6.8
 mhash_version=0.9.9.9
 
-# JDK
-jdk_6_version=1.6.45
-jdk_7_version=1.7.80
-jdk_8_version=1.8.45
-
-# tomcat
-tomcat_7_version=7.0.63
-tomcat_8_version=8.0.24
-
 # Ftp
 pureftpd_version=1.0.41
 
@@ -60,6 +62,8 @@ memcache_pecl_version=2.2.7
 # phpMyadmin
 phpMyAdmin_version=4.4.12
 
-# malloc
-tcmalloc_version=2.4
+# jemalloc
 jemalloc_version=3.6.0
+
+# tcmalloc
+tcmalloc_version=2.4

functions/jdk-1.6.sh

@@ -20,18 +20,17 @@ else
 	SYS_BIG_FLAG=i586
 fi
 
-JDK_VERSION="jdk-`echo $jdk_6_version | awk -F. '{print $2}'`u`echo $jdk_6_version | awk -F. '{print $3}'`"
+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"
 JAVA_dir=/usr/java
-JDK_NAME="jdk1.`echo $jdk_6_version | awk -F. '{print $2}'`.0_`echo $jdk_6_version | awk -F. '{print $3}'`"
+JDK_NAME="jdk$jdk_6_version"
 JDK_PATH=$JAVA_dir/$JDK_NAME
-src_url=http://mirrors.linuxeye.com/jdk/${JDK_VERSION}-linux-$SYS_BIG_FLAG.bin && Download_src
-
-chmod + ${JDK_VERSION}-linux-$SYS_BIG_FLAG.bin
+src_url=http://mirrors.linuxeye.com/jdk/$JDK_FILE && Download_src
 
 OS_CentOS='[ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`'
 OS_command
 
-./${JDK_VERSION}-linux-$SYS_BIG_FLAG.bin
+chmod +x $JDK_FILE
+./$JDK_FILE
 
 if [ -d "$JDK_NAME" ];then
         rm -rf $JAVA_dir; mkdir -p $JAVA_dir
@@ -41,6 +40,6 @@ if [ -d "$JDK_NAME" ];then
         [ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep '$JAVA_HOME/bin' /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=\$JAVA_HOME/bin:\1@" /etc/profile
         [ -z "`grep ^'export PATH=' /etc/profile | grep '$JAVA_HOME/bin'`" ] && echo 'export PATH=$JAVA_HOME/bin:$PATH' >> /etc/profile
         . /etc/profile
-        echo -e "\033[32m$JDK_VERSION install successfully! \033[0m"
+        echo -e "\033[32m$JDK_NAME install successfully! \033[0m"
 fi
 }

functions/jdk-1.7.sh

@@ -20,16 +20,16 @@ else
 	SYS_BIG_FLAG=i586
 fi
 
-JDK_VERSION="jdk-`echo $jdk_7_version | awk -F. '{print $2}'`u`echo $jdk_7_version | awk -F. '{print $3}'`"
+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"
 JAVA_dir=/usr/java
-JDK_NAME="jdk1.`echo $jdk_7_version | awk -F. '{print $2}'`.0_`echo $jdk_7_version | awk -F. '{print $3}'`"
+JDK_NAME="jdk$jdk_7_version"
 JDK_PATH=$JAVA_dir/$JDK_NAME
-src_url=http://mirrors.linuxeye.com/jdk/${JDK_VERSION}-linux-$SYS_BIG_FLAG.tar.gz && Download_src
+src_url=http://mirrors.linuxeye.com/jdk/$JDK_FILE && Download_src
 
 OS_CentOS='[ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`'
 OS_command
 
-tar xzf ${JDK_VERSION}-linux-$SYS_BIG_FLAG.tar.gz
+tar xzf $JDK_FILE 
 
 if [ -d "$JDK_NAME" ];then
 	rm -rf $JAVA_dir; mkdir -p $JAVA_dir
@@ -39,6 +39,6 @@ if [ -d "$JDK_NAME" ];then
 	[ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep '$JAVA_HOME/bin' /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=\$JAVA_HOME/bin:\1@" /etc/profile
 	[ -z "`grep ^'export PATH=' /etc/profile | grep '$JAVA_HOME/bin'`" ] && echo 'export PATH=$JAVA_HOME/bin:$PATH' >> /etc/profile
         . /etc/profile
-        echo -e "\033[32m$JDK_VERSION install successfully! \033[0m"
+        echo -e "\033[32m$JDK_NAME install successfully! \033[0m"
 fi
 }

functions/jdk-1.8.sh

@@ -20,16 +20,16 @@ else
 	SYS_BIG_FLAG=i586
 fi
 
-JDK_VERSION="jdk-`echo $jdk_8_version | awk -F. '{print $2}'`u`echo $jdk_8_version | awk -F. '{print $3}'`"
+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"
 JAVA_dir=/usr/java
-JDK_NAME="jdk1.`echo $jdk_8_version | awk -F. '{print $2}'`.0_`echo $jdk_8_version | awk -F. '{print $3}'`"
+JDK_NAME="jdk$jdk_8_version"
 JDK_PATH=$JAVA_dir/$JDK_NAME
-src_url=http://mirrors.linuxeye.com/jdk/${JDK_VERSION}-linux-$SYS_BIG_FLAG.tar.gz && Download_src
+src_url=http://mirrors.linuxeye.com/jdk/$JDK_FILE && Download_src
 
 OS_CentOS='[ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`'
 OS_command
 
-tar xzf ${JDK_VERSION}-linux-$SYS_BIG_FLAG.tar.gz
+tar xzf $JDK_FILE
 
 if [ -d "$JDK_NAME" ];then
 	rm -rf $JAVA_dir; mkdir -p $JAVA_dir
@@ -39,6 +39,6 @@ if [ -d "$JDK_NAME" ];then
 	[ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep '$JAVA_HOME/bin' /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=\$JAVA_HOME/bin:\1@" /etc/profile
 	[ -z "`grep ^'export PATH=' /etc/profile | grep '$JAVA_HOME/bin'`" ] && echo 'export PATH=$JAVA_HOME/bin:$PATH' >> /etc/profile
         . /etc/profile
-        echo -e "\033[32m$JDK_VERSION install successfully! \033[0m"
+        echo -e "\033[32m$JDK_NAME install successfully! \033[0m"
 fi
 }