Browse Source

Fix upgrade_db.sh

lj2007331@gmail.com 6 years ago
parent
commit
480b0526b3
3 changed files with 11 additions and 10 deletions
  1. 2 2
      include/upgrade_db.sh
  2. 8 8
      versions.txt
  3. 1 0
      vhost.sh

+ 2 - 2
include/upgrade_db.sh

@@ -83,8 +83,8 @@ Upgrade_DB() {
     fi
   done
 
-  if [ -e "${DB_name}.tar.gz" ]; then
-    echo "[${CMSG}${DB_name}.tar.gz${CEND}] found"
+  if [ -e "`ls ${DB_name}.tar.?z 2>/dev/null`" ]; then
+    echo "[${CMSG}`ls ${DB_name}.tar.?z 2>/dev/null`${CEND}] found"
     echo "Press Ctrl+c to cancel or Press any key to continue..."
     char=`get_char`
     if [ "${DB}" == 'MariaDB' ]; then

+ 8 - 8
versions.txt

@@ -3,7 +3,7 @@
 nginx_ver=1.14.0
 tengine_ver=2.2.2
 openresty_ver=1.13.6.2
-openssl_ver=1.0.2o
+openssl_ver=1.0.2p
 
 tomcat9_ver=9.0.10
 tomcat8_ver=8.5.32
@@ -23,8 +23,8 @@ mysql57_ver=5.7.23
 mysql56_ver=5.6.41
 mysql55_ver=5.5.61
 
-mariadb103_ver=10.3.8
-mariadb102_ver=10.2.16
+mariadb103_ver=10.3.9
+mariadb102_ver=10.2.17
 mariadb101_ver=10.1.35
 mariadb100_ver=10.0.36
 mariadb55_ver=5.5.61
@@ -46,8 +46,8 @@ jdk17_ver=1.7.0_80
 jdk16_ver=1.6.0_45
 
 # PHP
-php72_ver=7.2.8
-php71_ver=7.1.20
+php72_ver=7.2.9
+php71_ver=7.1.21
 php70_ver=7.0.31
 php56_ver=5.6.37
 php55_ver=5.5.38
@@ -61,7 +61,7 @@ mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
 libsodium_ver=1.0.16
 argon2_ver=20171227
-imagemagick_ver=6.9.10-9
+imagemagick_ver=6.9.10-10
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.28
 gmagick_for_php7_ver=2.0.5RC1
@@ -71,7 +71,7 @@ xcache_ver=3.2.0
 apcu_ver=4.0.11
 apcu_for_php7_ver=5.1.12
 eaccelerator_ver=0.9.6.1
-swoole_ver=4.0.3
+swoole_ver=4.0.4
 xdebug_ver=2.6.0
 
 # Ftp
@@ -82,7 +82,7 @@ redis_ver=4.0.11
 redis_pecl_ver=4.1.1
 
 # Memcached
-memcached_ver=1.5.9
+memcached_ver=1.5.10
 libmemcached_ver=1.0.18
 memcached_pecl_ver=2.2.0
 memcached_pecl_php7_ver=3.0.4

+ 1 - 0
vhost.sh

@@ -456,6 +456,7 @@ Nginx_rewrite() {
       rewrite="other"
     fi
     echo "You choose rewrite=${CMSG}$rewrite${CEND}"
+    [ "${NGX_FLAG}" == 'php' -a "${rewrite}" == "joomla" ] && NGX_CONF=$(echo -e "location ~ \\.php\$ {\n    #fastcgi_pass remote_php_ip:9000;\n    fastcgi_pass unix:/dev/shm/php-cgi.sock;\n    fastcgi_index index.php;\n    include fastcgi.conf;\n  }")
     [ "${NGX_FLAG}" == 'php' -a "${rewrite}" == "thinkphp" ] && NGX_CONF=$(echo -e "location ~ \.php {\n    #fastcgi_pass remote_php_ip:9000;\n    fastcgi_pass unix:/dev/shm/php-cgi.sock;\n    fastcgi_index index.php;\n    include fastcgi_params;\n    set \$real_script_name \$fastcgi_script_name;\n    if (\$fastcgi_script_name ~ \"^(.+?\.php)(/.+)\$\") {\n      set \$real_script_name \$1;\n      #set \$path_info \$2;\n    }\n    fastcgi_param SCRIPT_FILENAME \$document_root\$real_script_name;\n    fastcgi_param SCRIPT_NAME \$real_script_name;\n    #fastcgi_param PATH_INFO \$path_info;\n  }")
     [ "${NGX_FLAG}" == 'php' -a "${rewrite}" == "pathinfo" ] && NGX_CONF=$(echo -e "location / {\n    if (!-e \$request_filename) {\n      rewrite ^(.*)\$ /index.php?s=\$1 last;\n      break;\n    }\n  }\n\n  location ~ [^/]\.php(/|$) {\n    #fastcgi_pass remote_php_ip:9000;\n    fastcgi_pass unix:/dev/shm/php-cgi.sock;\n    fastcgi_index index.php;\n    include fastcgi.conf;\n    fastcgi_split_path_info ^(.+?\.php)(/.*)\$;\n    set \$path_info \$fastcgi_path_info;\n    fastcgi_param PATH_INFO \$path_info;\n    try_files \$fastcgi_script_name =404;\n  }")
     if [ "${rewrite}" != 'magento2' -a "${rewrite}" != 'pathinfo' ]; then