[style] rename jdk_option

README.md

@@ -1,6 +1,6 @@
 [![PayPal donate button](https://img.shields.io/badge/paypal-donate-green.svg)](https://paypal.me/yeho) [![支付宝捐助按钮](https://img.shields.io/badge/%E6%94%AF%E4%BB%98%E5%AE%9D-%E5%90%91TA%E6%8D%90%E5%8A%A9-green.svg)](https://static.oneinstack.com/images/alipay.png) [![微信捐助按钮](https://img.shields.io/badge/%E5%BE%AE%E4%BF%A1-%E5%90%91TA%E6%8D%90%E5%8A%A9-green.svg)](https://static.oneinstack.com/images/weixin.png)
 
-This script is written using the shell, in order to quickly deploy `LEMP`/`LAMP`/`LNMP`/`LNMPA`/`LTMP`(Linux, Nginx/Tengine/OpenResty, MySQL in a production environment/MariaDB/Percona, PHP, JAVA), applicable to CentOS 7 ~ 8(including redhat,AlmaLinux,Rocky), Debian 8 ~ 11, Ubuntu 16 ~ 21, Fedora 27+ of 32 and 64.
+This script is written using the shell, in order to quickly deploy `LEMP`/`LAMP`/`LNMP`/`LNMPA`/`LTMP`(Linux, Nginx/Tengine/OpenResty, MySQL in a production environment/MariaDB/Percona, PHP, JAVA), applicable to CentOS 7 ~ 8(including redhat,AlmaLinux,Rocky), Debian 8 ~ 11, Ubuntu 16 ~ 21, Fedora 27+ of 64.
 
 Script properties:
 - Continually updated, Provide Shell Interaction and Autoinstall
@@ -10,7 +10,7 @@ Script properties:
 - Providing multiple PHP versions (PHP-8.1, PHP-8.0, PHP-7.4, PHP-7.3, 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, Apache and ngx_lua_waf
 - Providing a plurality of Tomcat version (Tomcat-10, Tomcat-9, Tomcat-8, Tomcat-7)
-- Providing a plurality of OpenJDK version (OpenJDK-8, OpenJDK-11)
+- Providing a plurality of JDK version (OpenJDK-8, OpenJDK-11)
 - According to their needs to install PHP Cache Accelerator provides ZendOPcache, xcache, apcu, eAccelerator. And php extensions,include ZendGuardLoader,ionCube,SourceGuardian,imagick,gmagick,fileinfo,imap,ldap,calendar,phalcon,yaf,yar,redis,memcached,memcache,mongodb,swoole,xdebug
 - Installation Nodejs, Pureftpd, phpMyAdmin according to their needs
 - Install memcached, redis according to their needs

include/check_download.sh

@@ -88,8 +88,8 @@ checkDownload() {
       ;;
   esac
 
-  # openjdk apr
-  if [[ "${openjdk_option}"  =~ ^[1-2]$ ]]; then
+  # jdk apr
+  if [[ "${jdk_option}"  =~ ^[1-2]$ ]]; then
     echo "Download apr..."
     src_url=http://archive.apache.org/dist/apr/apr-${apr_ver}.tar.gz && Download_src
   fi

install.sh

@@ -58,7 +58,7 @@ Show_Help() {
                               yaf,yar,redis,memcached,memcache,mongodb,swoole,xdebug
   --nodejs                    Install Nodejs
   --tomcat_option [1-4]       Install Tomcat version
-  --openjdk_option [1-2]      Install OpenJDK version
+  --jdk_option [1-2]          Install JDK version
   --db_option [1-14]          Install DB version
   --dbinstallmethod [1-2]     DB install method, default: 1 binary install
   --dbrootpwd [password]      DB super password
@@ -73,7 +73,7 @@ Show_Help() {
   "
 }
 ARG_NUM=$#
-TEMP=`getopt -o hvV --long help,version,nginx_option:,apache,apache_mode_option:,apache_mpm_option:,php_option:,mphp_ver:,mphp_addons,phpcache_option:,php_extensions:,nodejs,tomcat_option:,openjdk_option:,db_option:,dbrootpwd:,dbinstallmethod:,pureftpd,redis,memcached,phpmyadmin,python,ssh_port:,iptables,reboot -- "$@" 2>/dev/null`
+TEMP=`getopt -o hvV --long help,version,nginx_option:,apache,apache_mode_option:,apache_mpm_option:,php_option:,mphp_ver:,mphp_addons,phpcache_option:,php_extensions:,nodejs,tomcat_option:,jdk_option:,db_option:,dbrootpwd:,dbinstallmethod:,pureftpd,redis,memcached,phpmyadmin,python,ssh_port:,iptables,reboot -- "$@" 2>/dev/null`
 [ $? != 0 ] && echo "${CWARNING}ERROR: unknown argument! ${CEND}" && Show_Help && exit 1
 eval set -- "${TEMP}"
 while :; do
@@ -149,9 +149,9 @@ while :; do
       [[ ! ${tomcat_option} =~ ^[1-4]$ ]] && { echo "${CWARNING}tomcat_option input error! Please only input number 1~4${CEND}"; exit 1; }
       [ -e "$tomcat_install_dir/conf/server.xml" ] && { echo "${CWARNING}Tomcat already installed! ${CEND}" ; unset tomcat_option; }
       ;;
-    --openjdk_option)
-      openjdk_option=$2; shift 2
-      [[ ! ${openjdk_option} =~ ^[1-2]$ ]] && { echo "${CWARNING}openjdk_option input error! Please only input number 1~2${CEND}"; exit 1; }
+    --jdk_option)
+      jdk_option=$2; shift 2
+      [[ ! ${jdk_option} =~ ^[1-2]$ ]] && { echo "${CWARNING}jdk_option input error! Please only input number 1~2${CEND}"; exit 1; }
       ;;
     --db_option)
       db_option=$2; shift 2
@@ -326,12 +326,12 @@ if [ ${ARG_NUM} == 0 ]; then
             [ "${tomcat_option}" != '5' -a -e "$tomcat_install_dir/conf/server.xml" ] && { echo "${CWARNING}Tomcat already installed! ${CEND}" ; unset tomcat_option; }
             if [[ "${tomcat_option}" =~ ^[1-3]$ ]]; then
               while :; do echo
-                echo 'Please select OpenJDK version:'
+                echo 'Please select JDK version:'
                 echo -e "\t${CMSG}1${CEND}. Install openjdk-8-jdk"
                 echo -e "\t${CMSG}2${CEND}. Install openjdk-11-jdk"
-                read -e -p "Please input a number:(Default 1 press Enter) " openjdk_option
-                openjdk_option=${openjdk_option:-1}
-                if [[ ! ${openjdk_option} =~ ^[1-2]$ ]]; then
+                read -e -p "Please input a number:(Default 1 press Enter) " jdk_option
+                jdk_option=${jdk_option:-1}
+                if [[ ! ${jdk_option} =~ ^[1-2]$ ]]; then
                   echo "${CWARNING}input error! Please only input number 1~3${CEND}"
                 else
                   break
@@ -339,11 +339,11 @@ if [ ${ARG_NUM} == 0 ]; then
               done
             elif [ "${tomcat_option}" == '4' ]; then
               while :; do echo
-                echo 'Please select OpenJDK version:'
+                echo 'Please select JDK version:'
                 echo -e "\t${CMSG}1${CEND}. Install openjdk-8-jdk"
-                read -e -p "Please input a number:(Default 1 press Enter) " openjdk_option
-                openjdk_option=${openjdk_option:-1}
-                if [[ ! ${openjdk_option} =~ ^1$ ]]; then
+                read -e -p "Please input a number:(Default 1 press Enter) " jdk_option
+                jdk_option=${jdk_option:-1}
+                if [[ ! ${jdk_option} =~ ^1$ ]]; then
                   echo "${CWARNING}input error! Please only input number 1${CEND}"
                 else
                   break
@@ -1040,7 +1040,7 @@ if [ "${mphp_flag}" == 'y' ]; then
 fi
 
 # JDK
-case "${openjdk_option}" in
+case "${jdk_option}" in
   1)
     . include/openjdk-8.sh
     Install_OpenJDK8 2>&1 | tee -a ${oneinstack_dir}/install.log