From 54c2c8a774f844e36e771a48f96e7d6a59596519 Mon Sep 17 00:00:00 2001
From: YAWAsau <229953100a@gmail.com>
Date: Sun, 5 Dec 2021 13:46:37 +0800
Subject: [PATCH] bug fix

---
 tools/bin/bin.sh | 48 ++++++++++++++++++++++++------------------------
 備份應用.sh      |  2 +-
 生成應用列表.sh  |  2 +-
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/tools/bin/bin.sh b/tools/bin/bin.sh
index 47691a3..fbb7f6a 100644
--- a/tools/bin/bin.sh
+++ b/tools/bin/bin.sh
@@ -18,7 +18,7 @@ if [[ -d $(magisk --path 2>/dev/null) ]]; then
 else
 	echo "Magisk busybox Path does not exist"
 fi ; export PATH="$PATH"
-backup_version="V12.4"
+backup_version="V12.6"
 #設置二進制命令目錄位置
 [[ $bin_path = "" ]] && echo "未正確指定bin.sh位置" && exit 2
 #bin_path="${bin_path/'/storage/emulated/'/'/data/media/'}"
@@ -162,7 +162,7 @@ echo_log() {
 }
 Open_apps="$(appinfo -o ands -ta c)"
 bn=147
-echoRgb "\n --------------歡迎使用⚡️🤟🐂纸備份--------------\n -當前腳本執行路徑:$MODDIR\n -busybox路徑:$(which busybox)\n -busybox版本:$(busybox | head -1 | awk '{print $2}')\n -appinfo版本:$(appinfo --version)\n -腳本版本:$backup_version\n -設備架構:$abi\n -品牌:$(getprop ro.product.brand)\n -設備代號:$(getprop ro.product.device)\n -型號:$(getprop ro.product.model)\n -Android版本:$(getprop ro.build.version.release)\n -SDK:$(getprop ro.build.version.sdk)\n -終端:$Open_apps"
+echoRgb "\n --------------script_backup--------------\n -當前腳本執行路徑:$MODDIR\n -busybox路徑:$(which busybox)\n -busybox版本:$(busybox | head -1 | awk '{print $2}')\n -appinfo版本:$(appinfo --version)\n -腳本版本:$backup_version\n -設備架構:$abi\n -品牌:$(getprop ro.product.brand)\n -設備代號:$(getprop ro.product.device)\n -型號:$(getprop ro.product.model)\n -Android版本:$(getprop ro.build.version.release)\n -SDK:$(getprop ro.build.version.sdk)\n -終端:$Open_apps"
 bn=195
 if [[ $script != "" ]]; then
 	if [[ ! -f $TMPDIR/scriptTMP ]]; then
@@ -208,29 +208,29 @@ dns="8.8.8.8"
 # Curl uses boringssl - first appeared in Marshmallow - don't try using ssl in older android versions
 [[ $(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"
-jsonpath="$bin_path/json"
-(curl "$Language" 2>/dev/null >"$jsonpath" && echoRgb "使用curl") || (down -s -L "$Language" 2>/dev/null >"$bin_path/json" && echoRgb "使用down")
-if [[ $? = 0 ]]; then
-	json="$(cat "$jsonpath")"
-	if [[ -f $jsonpath && $(echo "$json") != "" ]]; then
-		tag="$(echo "$json" | sed -r -n 's/.*"tag_name": *"(.*)".*/\1/p')"
-		if [[ $tag != "" ]]; then
-			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')"
-				download="$(echo "$json" | sed -r -n 's/.*"browser_download_url": *"(.*.zip)".*/\1/p')"
-				curl -O "https://gh.api.99988866.xyz/$download" || down -s -L -o "$MODDIR/$tag.zip" "https://gh.api.99988866.xyz/$download"
-				echo_log "下載${download##*/}"
-				if [[ $result = 0 ]]; then
-					zippath="$(find "$MODDIR" -maxdepth 1 -name "*.zip" -type f)"
-					GitHub="true"
-				else
-					echoRgb "請手動將備份腳本壓縮包放置在\n -$MODDIR後再次執行腳本進行更新" "0"
-				fi
-			else
-				echoRgb "本地版本:$backup_version 線上版本:$tag 版本一致無須更新"
-			fi
+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')"
+		curl -O "https://gh.api.99988866.xyz/$download" || down -s -L -o "$MODDIR/$tag.zip" "https://gh.api.99988866.xyz/$download"
+		echo_log "下載${download##*/}"
+		if [[ $result = 0 ]]; then
+			echoRgb "update $backup_version > $tag"
+			zippath="$(find "$MODDIR" -maxdepth 1 -name "*.zip" -type f)"
+			GitHub="true"
+		else
+			echoRgb "請手動將備份腳本壓縮包放置在\n -$MODDIR後再次執行腳本進行更新" "0"
 		fi
-		rm -rf "$jsonpath"
+	else
+		echoRgb "本地版本:$backup_version 線上版本:$tag 版本一致無須更新"
 	fi
 else
 	echoRgb "更新獲取失敗" "0"
diff --git a/備份應用.sh b/備份應用.sh
index 3fb43af..647bed6 100644
--- a/備份應用.sh
+++ b/備份應用.sh
@@ -84,7 +84,7 @@ fi
 [[ ! -d $Backup/tools ]] && cp -r "$tools_path" "$Backup" && rm -rf "$Backup/tools/bin/zip" "$Backup/tools/script"
 [[ ! -f $Backup/還原備份.sh ]] && cp -r "$script_path/restore" "$Backup/還原備份.sh"
 [[ ! -f $Backup/掃描資料夾名.sh ]] && cp -r "$script_path/Get_DirName" "$Backup/掃描資料夾名.sh"
-[[ ! -f $MODDIR/刪除已卸載備份.sh ]] && cp -r "$script_path/delete_backup" "$MODDIR/刪除已卸載備份.sh"
+[[ ! -f $Backup/刪除已卸載備份.sh ]] && cp -r "$script_path/delete_backup" "$Backup/刪除已卸載備份.sh"
 filesize="$(du -ks "$Backup" | awk '{print $1}')"
 Quantity=0
 #檢測apk狀態進行備份
diff --git a/生成應用列表.sh b/生成應用列表.sh
index 1eca1f5..fd8ba44 100644
--- a/生成應用列表.sh
+++ b/生成應用列表.sh
@@ -32,7 +32,7 @@ appinfo -sort-i -d " " -o ands,pn -pn $system $launcher_app -3 2>/dev/null | sed
 	app_1=($REPLY $REPLY)
 	if [[ $(cat "$nametxt" | grep -oE "${app_1[1]}$") = "" ]]; then
 		case ${app_1[1]} in
-		oneplus|miui|xiaomi|oppo|flyme|meizu|com.android.soundrecorder|com.mfashiongallery.emag|com.mi.health)
+		*oneplus*|*miui*|*xiaomi*|*oppo*|*flyme*|*meizu*|com.android.soundrecorder|com.mfashiongallery.emag|com.mi.health|*coloros*)
 			echoRgb "$REPLY 可能是廠商自帶應用 比對中....." "0"
 			if [[ $(appinfo -sort-i -d " " -o ands,pn -xm | grep -w "$REPLY") = $REPLY ]]; then
 				echoRgb "為Xposed模塊 進行添加" "1"