pull/632/head
Mr Chen 5 months ago
parent dbe9fd4222
commit 8f4fca5a6c
  1. 7
      plugins/php/versions/74/install.sh
  2. 8
      scripts/init.d/mw.tpl

@ -79,9 +79,10 @@ fi
cd $sourcePath/php/php${PHP_VER} cd $sourcePath/php/php${PHP_VER}
OPTIONS='--without-iconv' OPTIONS='--without-iconv'
if [ $sysName == 'Darwin' ]; then
OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)" # if [ $sysName == 'Darwin' ]; then
fi # OPTIONS="${OPTIONS} --with-external-pcre=$(brew --prefix pcre2)"
# fi
IS_64BIT=`getconf LONG_BIT` IS_64BIT=`getconf LONG_BIT`
if [ "$IS_64BIT" == "64" ];then if [ "$IS_64BIT" == "64" ];then

@ -531,10 +531,10 @@ mw_default(){
port=$(cat ${PANEL_DIR}/data/port.pl) port=$(cat ${PANEL_DIR}/data/port.pl)
fi fi
# if [ ! -f ${PANEL_DIR}/data/default.pl ];then if [ ! -f ${PANEL_DIR}/data/default.pl ];then
# echo -e "\033[33mInstall Failed\033[0m" echo -e "\033[33mInstall Failed\033[0m"
# exit 1 exit 1
# fi fi
password=$(cat ${PANEL_DIR}/data/default.pl) password=$(cat ${PANEL_DIR}/data/default.pl)

Loading…
Cancel
Save