Просмотр исходного кода

Add Apache check to install.sh

dump version to 2.7.c
兔姬桑 2 лет назад
Родитель
Сommit
032370e6cd
2 измененных файлов с 9 добавлено и 5 удалено
  1. 1 1
      config/version.php
  2. 8 4
      install.sh

+ 1 - 1
config/version.php

@@ -2,5 +2,5 @@
 
 return [
     'name' => 'ProxyPanel',
-    'number' => '2.7.b',
+    'number' => '2.7.c',
 ];

+ 8 - 4
install.sh

@@ -41,11 +41,15 @@ check_sys(){
     echo -e "\e[37;1;41m PHP did not installed! | PHP 未安装!\e[0m"
   fi
 
-  if which nginx >/dev/null; then
-    echo -e "\e[37;42m Nginx Installed! | Nginx 已安装!\e[0m"
-    nginx -v
+  if which nginx >/dev/null || which httpd >/dev/null; then
+    echo -e "\e[37;42m Nginx/Apache Installed! | Nginx 或 Apache 已安装!\e[0m"
+    if which nginx >/dev/null; then
+      nginx -v
+    else
+      httpd -v
+    fi
   else
-    echo -e "\e[37;1;41m Nginx did not installed! | Nginx 未安装!\e[0m"
+    echo -e "\e[37;1;41m Nginx/Apache did not installed! | Nginx 或 Apache 未安装!\e[0m"
   fi
 }
 #检查composer是否安装