Update apps.conf

apps.conf

@@ -25,14 +25,14 @@ 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
+jdk_8_version=1.8.0_60
 
 # PHP
 php_3_version=5.3.29
 php_4_version=5.4.44
 php_5_version=5.5.28
 php_6_version=5.6.12
-php_7_version=7.0.0beta3
+php_7_version=7.0.0RC1
 
 zendopcache_version=7.0.5
 xcache_version=3.2.0

include/mariadb-10.0.sh

@@ -52,6 +52,7 @@ OS_command
 cd ..
 
 # my.cf
+[ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
 cat > /etc/my.cnf << EOF
 [client]
 port = 3306

include/mariadb-5.5.sh

@@ -52,6 +52,7 @@ OS_command
 cd ..
 
 # my.cf
+[ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
 cat > /etc/my.cnf << EOF
 [client]
 port = 3306

include/mysql-5.5.sh

@@ -64,6 +64,7 @@ OS_command
 cd ..
 
 # my.cf
+[ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
 cat > /etc/my.cnf << EOF
 [client]
 port = 3306

include/mysql-5.6.sh

@@ -62,6 +62,7 @@ OS_command
 cd ..
 
 # my.cf
+[ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
 cat > /etc/my.cnf << EOF
 [client]
 port = 3306

include/percona-5.5.sh

@@ -64,6 +64,7 @@ OS_command
 cd ..
 
 # my.cf
+[ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
 cat > /etc/my.cnf << EOF
 [client]
 port = 3306

include/percona-5.6.sh

@@ -62,6 +62,7 @@ OS_command
 cd ..
 
 # my.cf
+[ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
 cat > /etc/my.cnf << EOF
 [client]
 port = 3306

install.sh

@@ -94,8 +94,8 @@ do
                 if [ $Nginx_version != 1 -a $Nginx_version != 2 -a $Nginx_version != 3 ];then
                     echo "${CWARNING}input error! Please only input number 1,2,3${CEND}"
                 else
-                    [ -e "$nginx_install_dir/sbin/nginx" ] && { echo "${CWARNING}Nginx already installed! ${CEND}"; Nginx_version=Other; }
-                    [ -e "$tengine_install_dir/sbin/nginx" ] && { echo "${CWARNING}Tengine already installed! ${CEND}"; Nginx_version=Other; }
+                    [ "$Nginx_version" != '3' -a -e "$nginx_install_dir/sbin/nginx" ] && { echo "${CWARNING}Nginx already installed! ${CEND}"; Nginx_version=Other; }
+                    [ "$Nginx_version" != '3' -a -e "$tengine_install_dir/sbin/nginx" ] && { echo "${CWARNING}Tengine already installed! ${CEND}"; Nginx_version=Other; }
                     break
                 fi
             done
@@ -112,7 +112,7 @@ do
                 if [ $Apache_version != 1 -a $Apache_version != 2 -a $Apache_version != 3 ];then
                     echo "${CWARNING}input error! Please only input number 1,2,3${CEND}"
                 else
-                    [ -e "$apache_install_dir/conf/httpd.conf" ] && { echo "${CWARNING}Aapche already installed! ${CEND}"; Apache_version=Other; }  
+                    [ "$Apache_version" != '3' -a -e "$apache_install_dir/conf/httpd.conf" ] && { echo "${CWARNING}Aapche already installed! ${CEND}"; Apache_version=Other; }  
                     break
                 fi
             done
@@ -228,7 +228,7 @@ do
                 echo -e "\t${CMSG}2${CEND}. Install php-5.4"
                 echo -e "\t${CMSG}3${CEND}. Install php-5.5"
                 echo -e "\t${CMSG}4${CEND}. Install php-5.6"
-                echo -e "\t${CMSG}5${CEND}. Install php-7/phpng(beta)"
+                echo -e "\t${CMSG}5${CEND}. Install php-7/phpng(RC)"
                 read -p "Please input a number:(Default 1 press Enter) " PHP_version
                 [ -z "$PHP_version" ] && PHP_version=1
                 if [ $PHP_version != 1 -a $PHP_version != 2 -a $PHP_version != 3 -a $PHP_version != 4 -a $PHP_version != 5 ];then