From c2a1a43625e0e05ba2be23682885f5a474d00301 Mon Sep 17 00:00:00 2001
From: HITSword <admin@huayizhiyun.com>
Date: Wed, 8 Jan 2020 16:20:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=A4=E6=96=AD=EF=BC=8C?=
 =?UTF-8?q?=E5=87=8F=E5=B0=91=E6=8A=A5=E9=94=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: HITSword <admin@huayizhiyun.com>
---
 Tools/nginx/amh_nginxupdate.sh   | 16 ++++++++++++----
 Tools/nginx/amh_tengineupdate.sh |  8 +++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Tools/nginx/amh_nginxupdate.sh b/Tools/nginx/amh_nginxupdate.sh
index c23b5be..45d2200 100644
--- a/Tools/nginx/amh_nginxupdate.sh
+++ b/Tools/nginx/amh_nginxupdate.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
 Cpunum=`cat /proc/cpuinfo |grep 'processor'|wc -l`;
-nginx_configure=`/usr/local/nginx/sbin/nginx -V 2> /tmp/nginx_configure && cat /tmp/nginx_configure | grep 'configure arguments' | cut -d: -f2 && rm -f /tmp/nginx_configure`;
+nginx_configure='--prefix=/usr/local/nginx --user=www --group=www --with-http_ssl_module --with-http_gzip_static_module --without-mail_pop3_module --without-mail_imap_module --without-mail_smtp_module --without-http_uwsgi_module --without-http_scgi_module --with-ipv6';
+[ -f /usr/local/nginx/sbin/nginx ] && nginx_configure=`/usr/local/nginx/sbin/nginx -V 2> /tmp/nginx_configure && cat /tmp/nginx_configure | grep 'configure arguments' | cut -d: -f2 && rm -f /tmp/nginx_configure`;
 new_nginx_configure=$nginx_configure;
+if ! echo "$new_nginx_configure" | grep 'with-http_stub_status_module' > /dev/null; then 
+  new_nginx_configure="${new_nginx_configure} --with-http_stub_status_module";
+fi;
+if ! echo "$new_nginx_configure" | grep 'with-stream' > /dev/null; then 
+  new_nginx_configure="${new_nginx_configure} --with-stream";
+fi;
 if echo "$new_nginx_configure" | grep 'ngx_http_upstream_check_module' > /dev/null; then 
     new_nginx_configure=`echo $new_nginx_configure | sed "s| --add-module=modules/ngx_http_upstream_check_module||"`;
 fi;
 
-nginx_version=`/usr/local/nginx/sbin/nginx -v 2> /tmp/nginx_version && cat /tmp/nginx_version && rm -f /tmp/nginx_version`;
+nginx_version='';
+[ -f /usr/local/nginx/sbin/nginx ] && nginx_version=`/usr/local/nginx/sbin/nginx -v 2> /tmp/nginx_version && cat /tmp/nginx_version && rm -f /tmp/nginx_version`;
 echo $nginx_version;
 
 if [ "$nginx_version" != "nginx version: nginx/1.14.0" ]; then
@@ -22,7 +30,7 @@ if [ "$nginx_version" != "nginx version: nginx/1.14.0" ]; then
   cd /usr/local/;
   rm -rf nginx-1.14.0 nginx-1.14.0.tar.gz;
   if grep -q -e "Tengine.*<br />" /home/wwwroot/index/web/View/index.php; then
-    sed -i "s|Nginx.*<br />|Nginx 1.14.0 <br />|" /home/wwwroot/index/web/View/index.php;
+    sed -i "s|Tengine.*<br />|Nginx 1.14.0 <br />|" /home/wwwroot/index/web/View/index.php;
   fi
   if grep -q -e "Nginx.*<br />" /home/wwwroot/index/web/View/index.php; then
     sed -i "s|Nginx.*<br />|Nginx 1.14.0 <br />|" /home/wwwroot/index/web/View/index.php;
@@ -30,4 +38,4 @@ if [ "$nginx_version" != "nginx version: nginx/1.14.0" ]; then
 fi;
 
 nginx -v
-echo 'AMH Nginx Update Done'
\ No newline at end of file
+echo 'AMH Nginx Update successful'
\ No newline at end of file
diff --git a/Tools/nginx/amh_tengineupdate.sh b/Tools/nginx/amh_tengineupdate.sh
index 30d6d82..eec4a10 100644
--- a/Tools/nginx/amh_tengineupdate.sh
+++ b/Tools/nginx/amh_tengineupdate.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 Cpunum=`cat /proc/cpuinfo |grep 'processor'|wc -l`;
-nginx_configure=`/usr/local/nginx/sbin/nginx -V 2> /tmp/nginx_configure && cat /tmp/nginx_configure | grep 'configure arguments' | cut -d: -f2 && rm -f /tmp/nginx_configure`;
+nginx_configure='--prefix=/usr/local/nginx --user=www --group=www --with-http_ssl_module --with-http_gzip_static_module --without-mail_pop3_module --without-mail_imap_module --without-mail_smtp_module --without-http_uwsgi_module --without-http_scgi_module --with-ipv6';
+[ -f /usr/local/nginx/sbin/nginx ] && nginx_configure=`/usr/local/nginx/sbin/nginx -V 2> /tmp/nginx_configure && cat /tmp/nginx_configure | grep 'configure arguments' | cut -d: -f2 && rm -f /tmp/nginx_configure`;
 new_nginx_configure=$nginx_configure;
 if ! echo "$new_nginx_configure" | grep 'with-http_stub_status_module' > /dev/null; then 
   new_nginx_configure="${new_nginx_configure} --with-http_stub_status_module";
@@ -12,7 +13,8 @@ if ! echo "$new_nginx_configure" | grep 'ngx_http_upstream_check_module' > /dev/
   new_nginx_configure="${new_nginx_configure} --add-module=modules/ngx_http_upstream_check_module";
 fi;
 
-nginx_version=`/usr/local/nginx/sbin/nginx -v 2> /tmp/nginx_version && cat /tmp/nginx_version | grep 'Tengine' && rm -f /tmp/nginx_version`;
+nginx_version='';
+[ -f /usr/local/nginx/sbin/nginx ] && nginx_version=`/usr/local/nginx/sbin/nginx -v 2> /tmp/nginx_version && cat /tmp/nginx_version && rm -f /tmp/nginx_version`;
 echo $nginx_version;
 
 if [ "$nginx_version" != "Tengine version: Tengine/2.3.2" ]; then
@@ -36,4 +38,4 @@ if [ "$nginx_version" != "Tengine version: Tengine/2.3.2" ]; then
 fi;
 
 nginx -v
-echo 'AMH Tengine Update Done'
\ No newline at end of file
+echo 'AMH Tengine Update successful'
\ No newline at end of file