From 8f4fca5a6c75c57595f1efc150eeb4a462d29c49 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Fri, 29 Nov 2024 05:10:44 +0800 Subject: [PATCH] update --- plugins/php/versions/74/install.sh | 7 ++++--- scripts/init.d/mw.tpl | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh index 17ee9609e..606cb7f90 100755 --- a/plugins/php/versions/74/install.sh +++ b/plugins/php/versions/74/install.sh @@ -79,9 +79,10 @@ fi cd $sourcePath/php/php${PHP_VER} OPTIONS='--without-iconv' -if [ $sysName == 'Darwin' ]; then - OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)" -fi + +# if [ $sysName == 'Darwin' ]; then +# OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)" +# fi IS_64BIT=`getconf LONG_BIT` if [ "$IS_64BIT" == "64" ];then diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl index 11d0c91d5..1919765b3 100755 --- a/scripts/init.d/mw.tpl +++ b/scripts/init.d/mw.tpl @@ -531,10 +531,10 @@ mw_default(){ port=$(cat ${PANEL_DIR}/data/port.pl) fi - # if [ ! -f ${PANEL_DIR}/data/default.pl ];then - # echo -e "\033[33mInstall Failed\033[0m" - # exit 1 - # fi + if [ ! -f ${PANEL_DIR}/data/default.pl ];then + echo -e "\033[33mInstall Failed\033[0m" + exit 1 + fi password=$(cat ${PANEL_DIR}/data/default.pl)