From a1144436ea0abdf66b0fc0faa33e0e125b5771df Mon Sep 17 00:00:00 2001 From: filesite Date: Sun, 14 Jul 2024 16:34:07 +0800 Subject: [PATCH] add backup download link for machete in upgrade.sh --- bin/upgrade.sh | 75 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 60 insertions(+), 15 deletions(-) diff --git a/bin/upgrade.sh b/bin/upgrade.sh index d2d6e40..97b3796 100755 --- a/bin/upgrade.sh +++ b/bin/upgrade.sh @@ -2,29 +2,74 @@ echo "Upgrade machete ..." echo "" +download_link_filesite="https://git.filesite.io/filesite/machete/archive/master.tar.gz" +download_link_gitcode="https://gitcode.net/filesite/machete/-/archive/master/machete-master.tar.gz" + + +# 检测域名是否能连接 +# 返回值:0 - 不能连接,1 - 可连接 +detectDomainCanConnect () { + domain=$1 + if [ -z "${domain}" ]; then + echo "Usage: detectDomainCanConnect domain" + echo "" + exit 1 + fi + + ping_res=`ping -c 3 "${domain}"` + if [[ $ping_res == *"100.0% packet loss"* ]]; then + return 0 + fi + + return 1 +} + mkdir -p /var/www/downloads cd /var/www/downloads/ rm -f master.tar.gz rm -rf machete/ -wget "https://git.filesite.io/filesite/machete/archive/master.tar.gz" -tar -zxvf master.tar.gz -rm -f master.tar.gz -rsync -vruL machete/* /var/www/machete/ \ - --exclude=www/content/ \ - --exclude=www/navs/ \ - --exclude=www/girls/ \ - --exclude=www/videos/ \ - --exclude=www/tajian/ \ - --exclude=runtime/ + +# 升级machete +detect_domain="git.filesite.io" +echo "检测${detect_domain}是否可连接..." +detectDomainCanConnect "${detect_domain}" +connect_res=$? +if [ $connect_res -eq 0 ]; then + echo "⚠️⚠️" + echo "当前网络无法连接[${detect_domain}],即将从备用网址下载machete" + curl --connect-timeout 15 "${download_link_gitcode}" -o "master.tar.gz" +else + curl --connect-timeout 15 "${download_link_filesite}" -o "master.tar.gz" +fi + +if [ -f "master.tar.gz" ]; then + + tar -zxvf master.tar.gz + rm -f master.tar.gz + rsync -vruL machete/* /var/www/machete/ \ + --exclude=www/content/ \ + --exclude=www/navs/ \ + --exclude=www/girls/ \ + --exclude=www/videos/ \ + --exclude=www/tajian/ \ + --exclude=runtime/ + +fi + # upgrade admin cd /var/www/downloads/ -wget "https://git.filesite.io/wen/jialuomaadmin/archive/master.tar.gz" -tar -zxvf master.tar.gz -rm -f master.tar.gz -rm -rf /var/www/machete/www/admin/ -mv jialuomaadmin/dist/ /var/www/machete/www/admin +curl --connect-timeout 15 "https://git.filesite.io/wen/jialuomaadmin/archive/master.tar.gz" -o "master.tar.gz" + +if [ -f "master.tar.gz" ]; then + + tar -zxvf master.tar.gz + rm -f master.tar.gz + rm -rf /var/www/machete/www/admin/ + mv jialuomaadmin/dist/ /var/www/machete/www/admin + +fi echo "Machete upgrade done." echo ""