del jdk_option limit

include/jdk-1.6.sh

@@ -13,26 +13,23 @@ Install-JDK16() {
   JDK_FILE="jdk-`echo ${jdk16_ver} | awk -F. '{print $2}'`u`echo ${jdk16_ver} | awk -F_ '{print $NF}'`-linux-${SYS_BIT_j}.bin"
   JAVA_dir=/usr/java
   JDK_NAME="jdk${jdk16_ver}"
-  JDK_PATH=$JAVA_dir/$JDK_NAME
-
-  [ "$OS" == 'CentOS' ] && [ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`
-
-  chmod +x $JDK_FILE
-  ./$JDK_FILE
-
-  if [ -d "$JDK_NAME" ]; then
-    rm -rf $JAVA_dir; mkdir -p $JAVA_dir
-    mv $JDK_NAME $JAVA_dir
+  JDK_PATH=${JAVA_dir}/${JDK_NAME}
+  [ "${OS}" == 'CentOS' ] && [ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`
+  chmod +x ${JDK_FILE}
+  ./${JDK_FILE}
+  [ ! -e ${JAVA_dir} ] && mkdir -p ${JAVA_dir}
+  /bin/cp -R ${JDK_NAME} ${JAVA_dir}
+  if [ -d "${JDK_PATH}" ]; then
     [ -z "`grep ^'export JAVA_HOME=' /etc/profile`" ] && { [ -z "`grep ^'export PATH=' /etc/profile`" ] && echo  "export JAVA_HOME=$JDK_PATH" >> /etc/profile || sed -i "s@^export PATH=@export JAVA_HOME=$JDK_PATH\nexport PATH=@" /etc/profile; } || sed -i "s@^export JAVA_HOME=.*@export JAVA_HOME=$JDK_PATH@" /etc/profile
     [ -z "`grep ^'export CLASSPATH=' /etc/profile`" ] && sed -i "s@export JAVA_HOME=\(.*\)@export JAVA_HOME=\1\nexport CLASSPATH=\$JAVA_HOME/lib/tools.jar:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib@" /etc/profile
     [ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep '$JAVA_HOME/bin' /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=\$JAVA_HOME/bin:\1@" /etc/profile
     [ -z "`grep ^'export PATH=' /etc/profile | grep '$JAVA_HOME/bin'`" ] && echo 'export PATH=$JAVA_HOME/bin:$PATH' >> /etc/profile
     . /etc/profile
+    rm -rf ${JDK_NAME}
     echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
   else
-    rm -rf $JAVA_dir
     echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}"
     kill -9 $$
   fi
-popd
+  popd
 }

include/jdk-1.7.sh

@@ -13,15 +13,11 @@ Install-JDK17() {
   JDK_FILE="jdk-`echo ${jdk17_ver} | awk -F. '{print $2}'`u`echo ${jdk17_ver} | awk -F_ '{print $NF}'`-linux-${SYS_BIT_j}.tar.gz"
   JAVA_dir=/usr/java
   JDK_NAME="jdk${jdk17_ver}"
-  JDK_PATH=$JAVA_dir/$JDK_NAME
-
-  [ "$OS" == 'CentOS' ] && [ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`
-
-  tar xzf $JDK_FILE
-
-  if [ -d "$JDK_NAME" ]; then
-    rm -rf $JAVA_dir; mkdir -p $JAVA_dir
-    mv $JDK_NAME $JAVA_dir
+  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

include/jdk-1.8.sh

@@ -13,15 +13,11 @@ Install-JDK18() {
   JDK_FILE="jdk-`echo ${jdk18_ver} | awk -F. '{print $2}'`u`echo ${jdk18_ver} | awk -F_ '{print $NF}'`-linux-${SYS_BIT_j}.tar.gz"
   JAVA_dir=/usr/java
   JDK_NAME="jdk${jdk18_ver}"
-  JDK_PATH=$JAVA_dir/$JDK_NAME
-
-  [ "$OS" == 'CentOS' ] && [ -n "`rpm -qa | grep jdk`" ] && rpm -e `rpm -qa | grep jdk`
-
-  tar xzf $JDK_FILE
-
-  if [ -d "$JDK_NAME" ]; then
-    rm -rf $JAVA_dir; mkdir -p $JAVA_dir
-    mv $JDK_NAME $JAVA_dir
+  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
@@ -29,7 +25,6 @@ Install-JDK18() {
     . /etc/profile
     echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
   else
-    rm -rf $JAVA_dir
     echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}"
     kill -9 $$
   fi

include/jdk-9.sh

@@ -13,15 +13,11 @@ Install-JDK9() {
   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`
-
-  tar xzf $JDK_FILE
-
-  if [ -d "$JDK_NAME" ]; then
-    rm -rf $JAVA_dir; mkdir -p $JAVA_dir
-    mv $JDK_NAME $JAVA_dir
+  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
@@ -29,7 +25,6 @@ Install-JDK9() {
     . /etc/profile
     echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
   else
-    rm -rf $JAVA_dir
     echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}"
     kill -9 $$
   fi

install.sh

@@ -119,18 +119,7 @@ while :; do
       ;;
     --jdk_option)
       jdk_option=$2; shift 2
-      if [ "${tomcat_option}" == '1' ]; then
-        [[ ! ${jdk_option} =~ ^[1-2]$ ]] && { echo "${CWARNING}jdk_option input error! Please only input number 1~2${CEND}"; exit 1; }
-      elif [ "${tomcat_option}" == '2' ]; then
-        [[ ! ${jdk_option} =~ ^[1-3]$ ]] && { echo "${CWARNING}jdk_option input error! Please only input number 1~3${CEND}"; exit 1; }
-      elif [ "${tomcat_option}" == '3' ]; then
-        [[ ! ${jdk_option} =~ ^[2-4]$ ]] && { echo "${CWARNING}jdk_option input error! Please only input number 2~4${CEND}"; exit 1; }
-      elif [ "${tomcat_option}" == '4' ]; then
-        [[ ! ${jdk_option} =~ ^[3-4]$ ]] && { echo "${CWARNING}jdk_option input error! Please only input number 3~4${CEND}"; exit 1; }
-      else
-        echo "${CWARNING}tomcat_option or jdk_option input error! More: http://tomcat.apache.org/whichversion.html${CEND}"
-        exit 1
-      fi
+      [[ ! ${jdk_option} =~ ^[1-4]$ ]] && { echo "${CWARNING}jdk_option input error! Please only input number 1~4${CEND}"; exit 1; }
       ;;
     --db_option)
       db_option=$2; shift 2