bug fix
This commit is contained in:
YAWAsau
107
tools/bin/bin.sh
107
tools/bin/bin.sh
@@ -20,7 +20,7 @@ else
|
||||
echo "Magisk busybox Path does not exist"
|
||||
fi
|
||||
export PATH="$PATH"
|
||||
backup_version="V13.9"
|
||||
backup_version="V14.1"
|
||||
#設置二進制命令目錄位置
|
||||
[[ $bin_path = "" ]] && echo "未正確指定bin.sh位置" && exit 2
|
||||
#bin_path="${bin_path/'/storage/emulated/'/'/data/media/'}"
|
||||
@@ -110,7 +110,14 @@ endtime() {
|
||||
}
|
||||
nskg=1
|
||||
Print() {
|
||||
notify "$nskg" "backup-$(date '+%T')" "$1" bs
|
||||
if [[ $toast_info = true ]]; then
|
||||
a=$(echo "backup-$(date '+%T')" | sed 's#/#{xiegang}#g')
|
||||
b=$(echo "$1" | sed 's#/#{xiegang}#g')
|
||||
content query --uri content://ice.message/notify/"$nskg<|>$a<|>$b<|>bs" >/dev/null 2>&1
|
||||
fi
|
||||
}
|
||||
longToast() {
|
||||
[[ $toast_info = true ]] && content query --uri content://ice.message/long/"$*" >/dev/null 2>&1
|
||||
}
|
||||
echoRgb() {
|
||||
#轉換echo顏色提高可讀性
|
||||
@@ -202,101 +209,7 @@ if [[ $(pm path ice.message) = "" ]]; then
|
||||
cp -r "${bin_path%/*}/apk"/*.apk "$TMPDIR" && pm install --user 0 -r "$TMPDIR"/*.apk &>/dev/null && rm -rf "$TMPDIR"/*
|
||||
[[ $? = 0 ]] && echoRgb "安裝toast成功" "1" || echoRgb "安裝toast失敗" "0"
|
||||
fi
|
||||
#sed -r -n 's/.*"tag_name": *"(.*)".*/\1/p'
|
||||
#sed -r -n 's/.*"browser_download_url": *"(.*-linux64\..*\.so\.bz2)".*/\1/p'
|
||||
cdn=2
|
||||
download_zip() {
|
||||
case $cdn in
|
||||
1)
|
||||
zip_url="http://huge.cf/download/?huge-url=$download"
|
||||
NJ="huge.cf"
|
||||
;;
|
||||
2)
|
||||
zip_url="https://ghproxy.com/$download"
|
||||
NJ="ghproxy.com"
|
||||
;;
|
||||
3)
|
||||
zip_url="https://gh.api.99988866.xyz/$download"
|
||||
NJ="gh.api.99988866.xyz"
|
||||
;;
|
||||
4)
|
||||
zip_url="https://github.lx164.workers.dev/$download"
|
||||
NJ="github.lx164.workers.dev"
|
||||
;;
|
||||
5)
|
||||
zip_url="https://shrill-pond-3e81.hunsh.workers.dev/$download"
|
||||
NJ="shrill-pond-3e81.hunsh.workers.dev"
|
||||
;;
|
||||
esac
|
||||
echoRgb "中轉供應商:${NJ}\n -Download_url:$zip_url"
|
||||
curl -O "$zip_url" || down -s -L -o "$MODDIR/${download##*/}" "$zip_url"
|
||||
echo_log "下載${download##*/}"
|
||||
}
|
||||
if [[ -e $bin_path/update ]]; then
|
||||
#settings get system system_locales
|
||||
LANG="$(getprop "persist.sys.locale")"
|
||||
zippath="$(find "$MODDIR" -maxdepth 1 -name "*.zip" -type f)"
|
||||
echoRgb "檢查更新中 請稍後......."
|
||||
Language="https://api.github.com/repos/Petit-Abba/backup_script_zh-CN/releases/latest"
|
||||
if [[ $LANG != "" ]]; then
|
||||
case $LANG in
|
||||
*-TW | *-tw)
|
||||
echoRgb "系統語系:繁體中文"
|
||||
Language="https://api.github.com/repos/YAWAsau/backup_script/releases/latest"
|
||||
;;
|
||||
*-CN | *-cn)
|
||||
echoRgb "系統語系:簡體中文"
|
||||
;;
|
||||
*)
|
||||
echoRgb "$LANG不支持 默認簡體中文" "0"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
echoRgb "獲取系統語系失敗 默認簡體中文" "0"
|
||||
fi
|
||||
dns="8.8.8.8"
|
||||
#dns="223.5.5.5,223.6.6.6"
|
||||
# Curl uses boringssl - first appeared in Marshmallow - don't try using ssl in older android versions
|
||||
#flag="https://dns.alidns.com/dns-query"
|
||||
[[ $(getprop ro.build.version.sdk) -lt 23 ]] && alias curl="curl -kL --dns-servers $dns$flag" || alias curl="curl -L --dns-servers $dns$flag"
|
||||
echoRgb "DNS:$dns"
|
||||
json="$(curl "$Language" 2>/dev/null)"
|
||||
if [[ $json != "" ]]; then
|
||||
echoRgb "使用curl"
|
||||
else
|
||||
json="$(down -s -L "$Language" 2>/dev/null)"
|
||||
[[ $json != "" ]] && echoRgb "使用down"
|
||||
fi
|
||||
if [[ $json != "" ]]; then
|
||||
tag="$(echo "$json" | sed -r -n 's/.*"tag_name": *"(.*)".*/\1/p')"
|
||||
if [[ $backup_version != $tag ]]; then
|
||||
echoRgb "發現新版本 從GitHub更新 版本:$tag\n -更新日誌:\n$(curl "https://api.github.com/repos/YAWAsau/backup_script/releases/latest" 2>/dev/null | sed -r -n 's/.*"body": *"(.*)".*/\1/p' || down -s -L "https://api.github.com/repos/YAWAsau/backup_script/releases/latest" 2>/dev/null | sed -r -n 's/.*"body": *"(.*)".*/\1/p')"
|
||||
download="$(echo "$json" | sed -r -n 's/.*"browser_download_url": *"(.*.zip)".*/\1/p')"
|
||||
download_zip
|
||||
if [[ $result = 0 ]]; then
|
||||
echoRgb "update $backup_version > $tag"
|
||||
zippath="$(find "$MODDIR" -maxdepth 1 -name "*.zip" -type f)"
|
||||
GitHub="true"
|
||||
else
|
||||
echoRgb "嘗試更換cdn直到下載成功"
|
||||
unset result
|
||||
n=0
|
||||
while [[ $result != 0 && n != 6 ]]; do
|
||||
let cdn++ n++
|
||||
download_zip
|
||||
sleep 0.5
|
||||
done
|
||||
echoRgb "如果還是下載失敗請手動將備份腳本壓縮包放置在\n -$MODDIR後再次執行腳本進行本地更新" "0"
|
||||
fi
|
||||
else
|
||||
echoRgb "本地版本:$backup_version 線上版本:$tag 版本一致無須更新"
|
||||
fi
|
||||
else
|
||||
echoRgb "更新獲取失敗" "0"
|
||||
fi
|
||||
else
|
||||
echoRgb "自動更新未開啟" "0"
|
||||
fi
|
||||
zippath="$(find "$MODDIR" -maxdepth 1 -name "*.zip" -type f 2>/dev/null)"
|
||||
if [[ $zippath != "" ]]; then
|
||||
case $(echo "$zippath" | wc -l) in
|
||||
1)
|
||||
|
||||
Reference in New Issue
Block a user