Add jdk-10,del jdk-9

README.md

@@ -10,7 +10,7 @@ Script properties:
 - Providing multiple PHP versions (PHP-7.2, PHP-7.1, PHP-7.0, PHP-5.6, PHP-5.5, PHP-5.4, PHP-5.3)
 - Provide Nginx, Tengine, OpenResty
 - Providing a plurality of Tomcat version (Tomcat-9, Tomcat-8, Tomcat-7, Tomcat-6)
-- Providing a plurality of JDK version (JDK-9, JDK-1.8, JDK-1.7, JDK-1.6)
+- Providing a plurality of JDK version (JDK-10, JDK-1.8, JDK-1.7, JDK-1.6)
 - Providing a plurality of Apache version (Apache-2.4, Apache-2.2)
 - According to their needs to install PHP Cache Accelerator provides ZendOPcache, xcache, apcu, eAccelerator. And php encryption and decryption tool ionCube, ZendGuardLoader, swoole, xdebug, Composer
 - Installation Pureftpd, phpMyAdmin according to their needs

include/check_download.sh

@@ -81,8 +81,8 @@ checkDownload() {
     if [[ "${jdk_option}"  =~ ^[1-4]$ ]]; then
       case "${jdk_option}" in
         1)
-          echo "Download JDK 9..."
-          JDK_FILE="jdk-${jdk9_ver}_linux-${SYS_BIT_j}_bin.tar.gz"
+          echo "Download JDK 10..."
+          JDK_FILE="jdk-${jdk10_ver}_linux-${SYS_BIT_j}_bin.tar.gz"
           ;;
         2)
           echo "Download JDK 1.8..."

include/jdk-9.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-# Author:  yeho <lj2007331 AT gmail.com>
-# BLOG:  https://blog.linuxeye.cn
-#
-# Notes: OneinStack for CentOS/RadHat 6+ Debian 6+ and Ubuntu 12+
-#
-# Project home page:
-#       https://oneinstack.com
-#       https://github.com/lj2007331/oneinstack
-
-Install-JDK9() {
-  pushd ${oneinstack_dir}/src > /dev/null
-  JDK_FILE="jdk-${jdk9_ver}_linux-${SYS_BIT_j}_bin.tar.gz"
-  JAVA_dir=/usr/java
-  JDK_NAME="jdk-${jdk9_ver}"
-  JDK_PATH=${JAVA_dir}/${JDK_NAME}
-  [ "${OS}" == 'CentOS' ] && [ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`
-  [ ! -e ${JAVA_dir} ] && mkdir -p ${JAVA_dir}
-  tar xzf ${JDK_FILE} -C ${JAVA_dir}
-  if [ -d "${JDK_PATH}" ]; then
-    [ -z "`grep ^'export JAVA_HOME=' /etc/profile`" ] && { [ -z "`grep ^'export PATH=' /etc/profile`" ] && echo  "export JAVA_HOME=${JDK_PATH}" >> /etc/profile || sed -i "s@^export PATH=@export JAVA_HOME=${JDK_PATH}\nexport PATH=@" /etc/profile; } || sed -i "s@^export JAVA_HOME=.*@export JAVA_HOME=${JDK_PATH}@" /etc/profile
-    [ -z "`grep ^'export CLASSPATH=' /etc/profile`" ] && sed -i "s@export JAVA_HOME=\(.*\)@export JAVA_HOME=\1\nexport CLASSPATH=\$JAVA_HOME/lib/tools.jar:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib@" /etc/profile
-    [ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep '$JAVA_HOME/bin' /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=\$JAVA_HOME/bin:\1@" /etc/profile
-    [ -z "`grep ^'export PATH=' /etc/profile | grep '$JAVA_HOME/bin'`" ] && echo 'export PATH=$JAVA_HOME/bin:$PATH' >> /etc/profile
-    . /etc/profile
-    echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
-  else
-    echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}"
-    kill -9 $$
-  fi
-  popd
-}

install.sh

@@ -273,7 +273,7 @@ if [ ${ARG_NUM} == 0 ]; then
             if [ "${tomcat_option}" == '1' ]; then
               while :; do echo
                 echo 'Please select JDK version:'
-                echo -e "\t${CMSG}1${CEND}. Install JDK-9"
+                echo -e "\t${CMSG}1${CEND}. Install JDK-10"
                 echo -e "\t${CMSG}2${CEND}. Install JDK-1.8"
                 read -p "Please input a number:(Default 1 press Enter) " jdk_option
                 [ -z "${jdk_option}" ] && jdk_option=1
@@ -286,7 +286,7 @@ if [ ${ARG_NUM} == 0 ]; then
             elif [ "${tomcat_option}" == '2' ]; then
               while :; do echo
                 echo 'Please select JDK version:'
-                echo -e "\t${CMSG}1${CEND}. Install JDK-9"
+                echo -e "\t${CMSG}1${CEND}. Install JDK-10"
                 echo -e "\t${CMSG}2${CEND}. Install JDK-1.8"
                 echo -e "\t${CMSG}3${CEND}. Install JDK-1.7"
                 read -p "Please input a number:(Default 2 press Enter) " jdk_option
@@ -910,8 +910,8 @@ esac
 # JDK
 case "${jdk_option}" in
   1)
-    . include/jdk-9.sh
-    Install-JDK9 2>&1 | tee -a ${oneinstack_dir}/install.log
+    . include/jdk-10.sh
+    Install-JDK10 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   2)
     . include/jdk-1.8.sh

versions.txt

@@ -40,7 +40,6 @@ mongodb_ver=3.6.4
 
 # JDK
 jdk10_ver=10.0.1
-jdk9_ver=9.0.4
 jdk18_ver=1.8.0_172
 jdk17_ver=1.7.0_80
 jdk16_ver=1.6.0_45