From fe3716a0a263e49f18e135f61e1e4b80a6159d94 Mon Sep 17 00:00:00 2001 From: jinqilin721 Date: Wed, 2 Aug 2023 19:19:51 +0800 Subject: [PATCH] =?UTF-8?q?23.08.02-=E6=9B=B4=E6=8D=A2github=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E4=B8=BA=E6=9C=AC=E7=AB=99=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- install/install_panel.sh | 12 ++++++------ install/pip_select.sh | 2 +- install/public.sh | 4 ++-- install/update6.sh | 8 ++++---- install/update6_en.sh | 6 +++--- install/yumRepo_select.sh | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index f473915..c8d2e83 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ btpanel-v7.7.0-backup 官方原版v7.7.0版本面板备份 **Centos/Ubuntu/Debian安装命令 独立运行环境（py3.7）：** ```Bash -curl -sSO https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/install_panel.sh && bash install_panel.sh +curl -sSO https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/install_panel.sh && bash install_panel.sh ``` 跳过登录框，以及破解插件等请自行搜索 diff --git a/install/install_panel.sh b/install/install_panel.sh index 10781ed..44d79d4 100644 --- a/install/install_panel.sh +++ b/install/install_panel.sh @@ -355,7 +355,7 @@ Get_Versions(){ fi } Install_Python_Lib(){ - curl -Ss --connect-timeout 3 -m 60 https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/pip_select.sh|bash + curl -Ss --connect-timeout 3 -m 60 https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/pip_select.sh|bash pyenv_path="/www/server/panel" if [ -f $pyenv_path/pyenv/bin/python ];then is_ssl=$($python_bin -c "import ssl" 2>&1|grep cannot) @@ -488,9 +488,9 @@ Install_Bt(){ sleep 1 fi - wget -O /etc/init.d/bt https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/src/bt6.init -T 10 - wget -O /www/server/panel/install/public.sh https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/public.sh -T 10 - wget -O panel.zip https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/src/panel6.zip -T 10 + wget -O /etc/init.d/bt https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/src/bt6.init -T 10 + wget -O /www/server/panel/install/public.sh https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/public.sh -T 10 + wget -O panel.zip https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/src/panel6.zip -T 10 if [ -f "${setup_path}/server/panel/data/default.db" ];then if [ -d "/${setup_path}/server/panel/old_data" ];then @@ -540,8 +540,8 @@ Install_Bt(){ chmod -R +x ${setup_path}/server/panel/script ln -sf /etc/init.d/bt /usr/bin/bt echo "${panelPort}" > ${setup_path}/server/panel/data/port.pl - wget -O /etc/init.d/bt https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/src/bt7.init -T 10 - wget -O /www/server/panel/init.sh https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/src/bt7.init -T 10 + wget -O /etc/init.d/bt https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/src/bt7.init -T 10 + wget -O /www/server/panel/init.sh https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/src/bt7.init -T 10 wget -O /www/server/panel/data/softList.conf ${download_Url}/install/conf/softList.conf } Set_Bt_Panel(){ diff --git a/install/pip_select.sh b/install/pip_select.sh index b41e2f1..fdf4a3c 100644 --- a/install/pip_select.sh +++ b/install/pip_select.sh @@ -8,7 +8,7 @@ fi export PATH LANG=en_US.UTF-8 get_PIP_URL(){ - nodes=(https://mirrors.tencent.com/pypi/simple https://pypi.doubanio.com/simple https://mirrors.aliyun.com/pypi/simple https://pypi.tuna.tsinghua.edu.cn/simple https://pypi.org/simple); + nodes=(https://mirrors.tencent.com/pypi/simple https://mirrors.aliyun.com/pypi/simple https://pypi.tuna.tsinghua.edu.cn/simple https://mirrors.xinac.net/pypi/simple); i=1; for node in ${nodes[@]}; do diff --git a/install/public.sh b/install/public.sh index 2db3004..5353b8c 100644 --- a/install/public.sh +++ b/install/public.sh @@ -149,9 +149,9 @@ if [ -d "/www/server/phpmyadmin/pma" ];then rm -rf /www/server/phpmyadmin/pma EN_CHECK=$(cat /www/server/panel/config/config.json |grep English) if [ "${EN_CHECK}" ];then - curl https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/update6_en.sh|bash + curl https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/update6_en.sh|bash else - curl https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/update6.sh|bash + curl https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/update6.sh|bash fi echo > /www/server/panel/data/restart.pl fi diff --git a/install/update6.sh b/install/update6.sh index 6359620..572873c 100644 --- a/install/update6.sh +++ b/install/update6.sh @@ -14,7 +14,7 @@ public_file=/www/server/panel/install/public.sh publicFileMd5=$(md5sum ${public_file} 2>/dev/null|awk '{print $1}') md5check="918CC0E14AC92F9D51BFD5CE6A076C36" if [ "${publicFileMd5}" != "${md5check}" ]; then - wget -O Tpublic.sh https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/public.sh -T 20; + wget -O Tpublic.sh https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/public.sh -T 20; publicFileMd5=$(md5sum Tpublic.sh 2>/dev/null|awk '{print $1}') if [ "${publicFileMd5}" == "${md5check}" ]; then \cp -rpa Tpublic.sh $public_file @@ -38,7 +38,7 @@ fi download_Url=$NODE_URL setup_path=/www -version=$(curl -Ss --connect-timeout 5 -m 2 https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/api/panel/get_version) +version=$(curl -Ss --connect-timeout 5 -m 2 https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/api/panel/get_version) if [ "$version" = '' ];then version='7.7.0' fi @@ -46,7 +46,7 @@ armCheck=$(uname -m|grep arm) if [ "${armCheck}" ];then version='7.7.0' fi -wget -T 5 -O /tmp/panel.zip https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/src/LinuxPanel-7.7.0.zip +wget -T 5 -O /tmp/panel.zip https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/src/LinuxPanel-7.7.0.zip dsize=$(du -b /tmp/panel.zip|awk '{print $1}') if [ $dsize -lt 10240 ];then echo "获取更新包失败，请稍后更新或联系宝塔运维" @@ -58,7 +58,7 @@ cd $setup_path/server/panel/ check_bt=`cat /etc/init.d/bt` if [ "${check_bt}" = "" ];then rm -f /etc/init.d/bt - wget -O /etc/init.d/bt https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/src/bt6.init -T 20 + wget -O /etc/init.d/bt https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/src/bt6.init -T 20 chmod +x /etc/init.d/bt fi rm -f /www/server/panel/*.pyc diff --git a/install/update6_en.sh b/install/update6_en.sh index 665e007..2f02fc3 100644 --- a/install/update6_en.sh +++ b/install/update6_en.sh @@ -14,7 +14,7 @@ public_file=/www/server/panel/install/public.sh publicFileMd5=$(md5sum ${public_file} 2>/dev/null|awk '{print $1}') md5check="918CC0E14AC92F9D51BFD5CE6A076C36" if [ "${publicFileMd5}" != "${md5check}" ]; then - wget -O Tpublic.sh https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/public.sh -T 20; + wget -O Tpublic.sh https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/public.sh -T 20; publicFileMd5=$(md5sum Tpublic.sh 2>/dev/null|awk '{print $1}') if [ "${publicFileMd5}" == "${md5check}" ]; then \cp -rpa Tpublic.sh $public_file @@ -42,7 +42,7 @@ version=$(curl -Ss --connect-timeout 5 -m 2 https://brandnew.aapanel.com/api/pan if [ "$version" = '' ];then version='6.8.16' fi -wget -T 5 -O /tmp/panel.zip https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/src/LinuxPanel-7.7.0.zip +wget -T 5 -O /tmp/panel.zip https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/src/LinuxPanel-7.7.0.zip dsize=$(du -b /tmp/panel.zip|awk '{print $1}') if [ $dsize -lt 10240 ];then echo "Failed to get update package, please update or contact aaPanel Operation" @@ -54,7 +54,7 @@ cd $setup_path/server/panel/ check_bt=`cat /etc/init.d/bt` if [ "${check_bt}" = "" ];then rm -f /etc/init.d/bt - wget -O /etc/init.d/bt https://raw.githubusercontent.com/zhucaidan/btpanel-v7.7.0/main/install/src/bt6.init -T 20 + wget -O /etc/init.d/bt https://git.xinac.net/github/btpanel-v7.7.0/raw/branch/main/install/src/bt6.init -T 20 chmod +x /etc/init.d/bt fi rm -f /www/server/panel/*.pyc diff --git a/install/yumRepo_select.sh b/install/yumRepo_select.sh index 8c7b25e..dd189ec 100644 --- a/install/yumRepo_select.sh +++ b/install/yumRepo_select.sh @@ -2,7 +2,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin export PATH get_Yum_Repo(){ - nodes=(http://mirrors.cloud.tencent.com/repo/centos7_base.repo http://mirrors.aliyun.com/repo/Centos-7.repo http://mirrors.163.com/.help/CentOS7-Base-163.repo https://mirrors.tuna.tsinghua.edu.cn/help/centos/index.html) + nodes=(http://mirrors.cloud.tencent.com/repo/centos7_base.repo http://mirrors.aliyun.com/repo/Centos-7.repo) i=1 for node in ${nodes[@]}; do