Browse Source

Update install.sh

lj2007331@gmail.com 6 years ago
parent
commit
1653fdfb5b
2 changed files with 22 additions and 4 deletions
  1. 19 1
      install.sh
  2. 3 3
      versions.txt

+ 19 - 1
install.sh

@@ -50,7 +50,7 @@ showhelp() {
   --apache_option [1-2]       Install Apache server version
   --php_option [1-7]          Install PHP version
   --phpcache_option [1-4]     Install PHP opcode cache, default: 1 opcache
-  --php_extensions [ext name] Install PHP extension, include zendguardloader,ioncube,imagick,gmagick
+  --php_extensions [ext name] Install PHP extension, include zendguardloader,ioncube,imagick,gmagick,redis,memcached,memcache
   --tomcat_option [1-4]       Install Tomcat version
   --jdk_option [1-4]          Install JDK version
   --db_option [1-15]          Install DB version
@@ -108,6 +108,9 @@ while :; do
       [ -n "`echo ${php_extensions} | grep -w ioncube`" ] && ioncube_yn=y
       [ -n "`echo ${php_extensions} | grep -w imagick`" ] && magick_option=1
       [ -n "`echo ${php_extensions} | grep -w gmagick`" ] && magick_option=2
+      [ -n "`echo ${php_extensions} | grep -w redis`" ] && redis_pecl=1
+      [ -n "`echo ${php_extensions} | grep -w memcached`" ] && memcached_pecl=1
+      [ -n "`echo ${php_extensions} | grep -w memcache`" ] && memcache_pecl=1
       ;;
     --tomcat_option)
       tomcat_option=$2; shift 2
@@ -948,6 +951,11 @@ if [ "${redis_yn}" == 'y' ]; then
   [ -e "${php_install_dir}/bin/phpize" ] && [ ! -e "$(${php_install_dir}/bin/php-config --extension-dir)/redis.so" ] && Install_php-redis 2>&1 | tee -a ${oneinstack_dir}/install.log
 fi
 
+if [ "${redis_pecl}" == '1' ]; then
+  . include/redis.sh
+  [ -e "${php_install_dir}/bin/phpize" ] && [ ! -e "$(${php_install_dir}/bin/php-config --extension-dir)/redis.so" ] && Install_php-redis 2>&1 | tee -a ${oneinstack_dir}/install.log
+fi
+
 # memcached
 if [ "${memcached_yn}" == 'y' ]; then
   . include/memcached.sh
@@ -956,6 +964,16 @@ if [ "${memcached_yn}" == 'y' ]; then
   [ -e "${php_install_dir}/bin/phpize" ] && [ ! -e "$(${php_install_dir}/bin/php-config --extension-dir)/memcached.so" ] && Install_php-memcached 2>&1 | tee -a ${oneinstack_dir}/install.log
 fi
 
+if [ "${memcached_pecl}" == '1' ]; then
+  . include/memcached.sh
+  [ -e "${php_install_dir}/bin/phpize" ] && [ ! -e "$(${php_install_dir}/bin/php-config --extension-dir)/memcached.so" ] && Install_php-memcached 2>&1 | tee -a ${oneinstack_dir}/install.log
+fi
+
+if [ "${memcache_pecl}" == '1' ]; then
+  . include/memcached.sh
+  [ -e "${php_install_dir}/bin/phpize" ] && [ ! -e "$(${php_install_dir}/bin/php-config --extension-dir)/memcache.so" ] && Install_php-memcache 2>&1 | tee -a ${oneinstack_dir}/install.log
+fi
+
 # index example
 if [ ! -e "${wwwroot_dir}/default/index.html" -a "${web_yn}" == 'y' ]; then
   . include/demo.sh

+ 3 - 3
versions.txt

@@ -55,7 +55,7 @@ php54_ver=5.4.45
 php53_ver=5.3.29
 
 libiconv_ver=1.15
-curl_ver=7.61.0
+curl_ver=7.61.1
 libmcrypt_ver=2.5.8
 mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
@@ -63,7 +63,7 @@ libsodium_ver=1.0.16
 argon2_ver=20171227
 imagemagick_ver=6.9.10-11
 imagick_ver=3.4.3
-graphicsmagick_ver=1.3.28
+graphicsmagick_ver=1.3.30
 gmagick_for_php7_ver=2.0.5RC1
 gmagick_ver=1.1.7RC3
 zendopcache_ver=7.0.5
@@ -72,7 +72,7 @@ apcu_ver=4.0.11
 apcu_for_php7_ver=5.1.12
 eaccelerator_ver=0.9.6.1
 swoole_ver=4.1.2
-xdebug_ver=2.6.0
+xdebug_ver=2.6.1
 
 # Ftp
 pureftpd_ver=1.0.47