From bf9b6b60460bdcd69bbfad860cac5943e6e5b619 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Fri, 10 Jan 2025 23:12:56 +0800 Subject: [PATCH 1/5] up --- plugins/php/versions/74/install.sh | 2 +- plugins/php/versions/80/install.sh | 2 +- plugins/php/versions/81/install.sh | 2 +- plugins/php/versions/82/install.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh index 1c2500251c..99bc26a6dc 100755 --- a/plugins/php/versions/74/install.sh +++ b/plugins/php/versions/74/install.sh @@ -42,7 +42,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ "$LOCAL_ADDR" == "cn" ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.sohu.com/php/php-${version}.tar.xz + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.nju.edu.cn/php/php-${version}.tar.xz fi fi # ----------------------------------------------------------------------- # diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh index 8617307980..22a5cd6538 100755 --- a/plugins/php/versions/80/install.sh +++ b/plugins/php/versions/80/install.sh @@ -39,7 +39,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ "$LOCAL_ADDR" == "cn" ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.sohu.com/php/php-${version}.tar.xz + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.nju.edu.cn/php/php-${version}.tar.xz fi fi # ----------------------------------------------------------------------- # diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh index c1cf79c2ea..d9fa08f95f 100755 --- a/plugins/php/versions/81/install.sh +++ b/plugins/php/versions/81/install.sh @@ -39,7 +39,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ "$LOCAL_ADDR" == "cn" ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.sohu.com/php/php-${version}.tar.xz + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.nju.edu.cn/php/php-${version}.tar.xz fi fi # ----------------------------------------------------------------------- # diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh index 4e07fe857d..cb2b80664c 100755 --- a/plugins/php/versions/82/install.sh +++ b/plugins/php/versions/82/install.sh @@ -39,7 +39,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ "$LOCAL_ADDR" == "cn" ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.sohu.com/php/php-${version}.tar.xz + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.nju.edu.cn/php/php-${version}.tar.xz fi fi # ----------------------------------------------------------------------- # From 42e9859ccbcccdfb1711e32a1d98587f67e6516f Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Fri, 10 Jan 2025 23:13:23 +0800 Subject: [PATCH 2/5] Update install.sh --- plugins/php/versions/72/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh index a3d5f6f989..01676718b8 100755 --- a/plugins/php/versions/72/install.sh +++ b/plugins/php/versions/72/install.sh @@ -34,7 +34,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ "$LOCAL_ADDR" == "cn" ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.sohu.com/php/php-${version}.tar.xz + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.nju.edu.cn/php/php-${version}.tar.xz fi fi # ----------------------------------------------------------------------- # From 0c7dc4dbee77895193b8c4f8abb235c258f7b35a Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Fri, 10 Jan 2025 23:14:18 +0800 Subject: [PATCH 3/5] up --- plugins/php/versions/52/install.sh | 2 +- plugins/php/versions/53/install.sh | 2 +- plugins/php/versions/54/install.sh | 2 +- plugins/php/versions/55/install.sh | 2 +- plugins/php/versions/56/install.sh | 2 +- plugins/php/versions/70/install.sh | 2 +- plugins/php/versions/71/install.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh index 3d9225a256..caee453a0d 100755 --- a/plugins/php/versions/52/install.sh +++ b/plugins/php/versions/52/install.sh @@ -33,7 +33,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ "$LOCAL_ADDR" == "cn" ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.sohu.com/php/php-${version}.tar.xz + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.nju.edu.cn/php/php-${version}.tar.xz fi fi # ----------------------------------------------------------------------- # diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh index 49906af258..8f3e13be96 100755 --- a/plugins/php/versions/53/install.sh +++ b/plugins/php/versions/53/install.sh @@ -33,7 +33,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ "$LOCAL_ADDR" == "cn" ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.sohu.com/php/php-${version}.tar.xz + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.nju.edu.cn/php/php-${version}.tar.xz fi fi # ----------------------------------------------------------------------- # diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh index 5c0012883b..d497fc791c 100755 --- a/plugins/php/versions/54/install.sh +++ b/plugins/php/versions/54/install.sh @@ -34,7 +34,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ "$LOCAL_ADDR" == "cn" ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.sohu.com/php/php-${version}.tar.xz + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.nju.edu.cn/php/php-${version}.tar.xz fi fi # ----------------------------------------------------------------------- # diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh index 4331d545e0..511a8796fd 100755 --- a/plugins/php/versions/55/install.sh +++ b/plugins/php/versions/55/install.sh @@ -34,7 +34,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ "$LOCAL_ADDR" == "cn" ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.sohu.com/php/php-${version}.tar.xz + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.nju.edu.cn/php/php-${version}.tar.xz fi fi # ----------------------------------------------------------------------- # diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh index a811da0f6b..675d53dceb 100755 --- a/plugins/php/versions/56/install.sh +++ b/plugins/php/versions/56/install.sh @@ -37,7 +37,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ "$LOCAL_ADDR" == "cn" ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.sohu.com/php/php-${version}.tar.xz + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.nju.edu.cn/php/php-${version}.tar.xz fi fi # ----------------------------------------------------------------------- # diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh index 7d66c671b9..257c00134a 100755 --- a/plugins/php/versions/70/install.sh +++ b/plugins/php/versions/70/install.sh @@ -34,7 +34,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ "$LOCAL_ADDR" == "cn" ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.sohu.com/php/php-${version}.tar.xz + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.nju.edu.cn/php/php-${version}.tar.xz fi fi # ----------------------------------------------------------------------- # diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh index e906d358ef..05bf6269b9 100755 --- a/plugins/php/versions/71/install.sh +++ b/plugins/php/versions/71/install.sh @@ -34,7 +34,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ "$LOCAL_ADDR" == "cn" ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.sohu.com/php/php-${version}.tar.xz + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.nju.edu.cn/php/php-${version}.tar.xz fi fi # ----------------------------------------------------------------------- # From 1bfc02a892da180d5e449a1f50b2e1fa89b355f7 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Fri, 10 Jan 2025 23:15:01 +0800 Subject: [PATCH 4/5] Update install.sh --- plugins/php/versions/83/install.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh index f5912fee8d..372c0ed2e3 100755 --- a/plugins/php/versions/83/install.sh +++ b/plugins/php/versions/83/install.sh @@ -31,17 +31,17 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then # ----------------------------------------------------------------------- # # 中国优化安装 - # cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"") - # LOCAL_ADDR=common - # if [ ! -z "$cn" ];then - # LOCAL_ADDR=cn - # fi - - # if [ "$LOCAL_ADDR" == "cn" ];then - # if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - # wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.sohu.com/php/php-${version}.tar.xz - # fi - # fi + cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"") + LOCAL_ADDR=common + if [ ! -z "$cn" ];then + LOCAL_ADDR=cn + fi + + if [ "$LOCAL_ADDR" == "cn" ];then + if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://mirrors.nju.edu.cn/php/php-${version}.tar.xz + fi + fi # ----------------------------------------------------------------------- # From ee58805ae97e7e8f78605d56c39ac1e500eaa620 Mon Sep 17 00:00:00 2001 From: jyeric Date: Sun, 12 Jan 2025 03:49:32 +0800 Subject: [PATCH 5/5] Fix: Unable to move --- scripts/old/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/old/install.sh b/scripts/old/install.sh index 33ec455210..8971bfea25 100644 --- a/scripts/old/install.sh +++ b/scripts/old/install.sh @@ -101,7 +101,7 @@ if [ $OSNAME != "macos" ];then if [ "$LOCAL_ADDR" == "common" ];then curl --insecure -sSLo /tmp/master.zip ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/tags/${VERSION}.zip cd /tmp && unzip /tmp/master.zip - mv -f /tmp/mdserver-web-master /www/server/mdserver-web + mv -f /tmp/mdserver-web-${VERSION} /www/server/mdserver-web rm -rf /tmp/master.zip rm -rf /tmp/mdserver-web-master else @@ -175,4 +175,4 @@ echo -e "Time consumed:\033[32m $outTime \033[0mMinute!" } 1> >(tee $LOG_FILE) 2>&1 echo -e "\nInstall completed. If error occurs, please contact us with the log file mw-install.log ." -echo "安装完毕,如果出现错误,请带上同目录下的安装日志 mw-install.log 联系我们反馈." \ No newline at end of file +echo "安装完毕,如果出现错误,请带上同目录下的安装日志 mw-install.log 联系我们反馈."