xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

V6.2.9 更新脚本默认使用 ghproxy 代理

This commit is contained in:
Hyy2001X 2021-06-25 22:20:05 +08:00
parent 8969b918b4
commit 84c4512598
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Scripts/AutoUpdate.sh
View File

@ -561,7 +561,7 @@ AutoUpdate_Main() {
[[ -n ${Version} ]] && echo "${Version}" || echo "未知" [[ -n ${Version} ]] && echo "${Version}" || echo "未知"
;; ;;
cloud) cloud)
Cloud_Script_Version="$(${Downloader} https://raw.fastgit.org/Hyy2001X/AutoBuild-Actions/master/Scripts/AutoUpdate.sh -O - | egrep -o "V[0-9].+")" Cloud_Script_Version="$(${Downloader} https://ghproxy.com/https://raw.githubusercontent.com/Hyy2001X/AutoBuild-Actions/master/Scripts/AutoUpdate.sh -O - | egrep -o "V[0-9].+")"
[[ -n ${Cloud_Script_Version} ]] && echo "${Cloud_Script_Version}" || echo "未知" [[ -n ${Cloud_Script_Version} ]] && echo "${Cloud_Script_Version}" || echo "未知"
;; ;;
*) *)
@ -598,29 +598,21 @@ AutoUpdate_Main() {
;; ;;
-x) -x)
while [[ $1 ]];do while [[ $1 ]];do
[[ $1 == -P || $1 == --proxy ]] && Proxy_Mode=1 if [[ $1 =~ url= ]];then
if [[ ${Proxy_Mode} == 1 && $1 =~ url= ]];then
ECHO r "参数冲突: [$0 $*],[-P,--proxy] 与 [url=] 不能同时存在!"
EXIT 1
fi
if [[ ! $1 =~ url= ]];then
Script_URL=https://raw.githubusercontent.com/Hyy2001X/AutoBuild-Actions/master/Scripts/AutoUpdate.sh
else
[[ $1 =~ url= ]] && { [[ $1 =~ url= ]] && {
[[ -z $(echo $1 | cut -d "=" -f2) ]] && ECHO r "脚本地址不能为空!" && EXIT 1 [[ -z $(echo $1 | cut -d "=" -f2) ]] && ECHO r "脚本地址不能为空!" && EXIT 1
Script_URL="$(echo $1 | cut -d "=" -f2)" AutoUpdate_Script_URL="$(echo $1 | cut -d "=" -f2)"
ECHO "使用自定义脚本地址: ${Script_URL}" ECHO "使用自定义脚本地址: ${AutoUpdate_Script_URL}"
} }
fi fi
[[ $1 =~ path= ]] && { [[ $1 =~ path= ]] && {
[ -z "$(echo $1 | cut -d "=" -f2)" ] && ECHO r "保存路径不能为空!" && EXIT 1 [[ -z $(echo $1 | cut -d "=" -f2) ]] && ECHO r "保存路径不能为空!" && EXIT 1
SH_SAVE_PATH="$(echo $1 | cut -d "=" -f2)" SH_SAVE_PATH="$(echo $1 | cut -d "=" -f2)"
} }
shift shift
done done
[[ ${Proxy_Mode} == 1 ]] && Script_URL="https://ghproxy.com/${Script_URL}"
[[ -z ${SH_SAVE_PATH} ]] && SH_SAVE_PATH=/bin [[ -z ${SH_SAVE_PATH} ]] && SH_SAVE_PATH=/bin
UPDATE_SCRIPT ${SH_SAVE_PATH} ${Script_URL} UPDATE_SCRIPT ${SH_SAVE_PATH} ${AutoUpdate_Script_URL}
;; ;;
-n | -f | -u | -T | --test | -P | --proxy | -F | --force) -n | -f | -u | -T | --test | -P | --proxy | -F | --force)
PREPARE_UPGRADES $* PREPARE_UPGRADES $*
@ -698,9 +690,10 @@ AutoUpdate_Main() {
done done
} }
Version=V6.2.8 Version=V6.2.9
AutoUpdate_Path=/tmp/AutoUpdate AutoUpdate_Path=/tmp/AutoUpdate
AutoUpdate_Log_Path=/tmp AutoUpdate_Log_Path=/tmp
AutoUpdate_Script_URL=https://ghproxy.com/https://raw.githubusercontent.com/Hyy2001X/AutoBuild-Actions/master/Scripts/AutoUpdate.sh
Upgrade_Command=sysupgrade Upgrade_Command=sysupgrade
Default_Variable=/etc/AutoBuild/Default_Variable Default_Variable=/etc/AutoBuild/Default_Variable
Custom_Variable=/etc/AutoBuild/Custom_Variable Custom_Variable=/etc/AutoBuild/Custom_Variable