From c67d06250ab1126ede102a73b67577c2730554f5 Mon Sep 17 00:00:00 2001
From: YAWAsau <229953100a@gmail.com>
Date: Sat, 6 Nov 2021 20:03:28 +0800
Subject: [PATCH] bug fix

---
 tools/bin/bin.sh    |  2 +-
 備份應用.sh         | 24 +++++++++++++-----------
 本地一鍵更新腳本.sh |  6 +++++-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/tools/bin/bin.sh b/tools/bin/bin.sh
index 6e709ee..50b30f2 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="V11.2 2021/11/5-19:45"
+backup_version="V11.3 2021/11/6-20:00"
 #設置二進制命令目錄位置
 [[ $bin_path = "" ]] && echo "未正確指定bin.sh位置" && exit 2
 #bin_path="${bin_path/'/storage/emulated/'/'/data/media/'}"
diff --git a/備份應用.sh b/備份應用.sh
index 0349bd2..3f0e0fe 100644
--- a/備份應用.sh
+++ b/備份應用.sh
@@ -60,19 +60,21 @@ echoRgb "提示 腳本支持後台壓縮 可以直接離開腳本\n -或是關
 if [[ $PU != "" ]]; then
 	[[ -f /proc/mounts ]] && PT="$(cat /proc/mounts | grep "$PU" | awk '{print $2}')"
 	if [[ -d $PT ]]; then
-		if [[ $USBdefault = false ]]; then
-			echoRgb "檢測到隨身碟 是否在隨身碟備份\n -音量上是，音量下不是"
-			get_version "選擇了隨身碟備份" "選擇了本地備份"
-			if $branch = true ]]; then
-				Backup="$PT/Backup_$Compression_method"
-				data="/dev/block/vold/$PU"
-				hx="USB"
-			fi
-		else
+		if [[ $(echo "$MODDIR" | grep -oE "^${PT}") != "" || $USBdefault = true ]]; then
 			echoRgb "於隨身碟備份" "1"
 			Backup="$PT/Backup_$Compression_method"
 			data="/dev/block/vold/$PU"
 			hx="USB"
+		else
+			if [[ $USBdefault = false ]]; then
+				echoRgb "檢測到隨身碟 是否在隨身碟備份\n -音量上是，音量下不是"
+				get_version "選擇了隨身碟備份" "選擇了本地備份"
+				if $branch = true ]]; then
+					Backup="$PT/Backup_$Compression_method"
+					data="/dev/block/vold/$PU"
+					hx="USB"
+				fi
+			fi
 		fi
 	fi
 else
@@ -99,7 +101,7 @@ Backup_apk() {
 		unset xb ; result=0
 		echoRgb "Apk版本無更新 跳過備份"
 	else
-		[[ $lxj -ge 95 ]] && echoRgb "$data空間不足,達到$lxj%" "0" && exit 2
+		[[ $lxj -ge 95 ]] && echoRgb "$hx空間不足,達到$lxj%" "0" && exit 2
 		rm -rf "$Backup_folder"/*.apk
 		#備份apk
 		echoRgb "$1"
@@ -152,7 +154,7 @@ Backup_data() {
 	if [[ -d $data_path ]]; then
 		if [[ $Size != $(du -ks "$data_path" | awk '{print $1}') ]]; then
 			[[ $name1 != $Open_apps ]] && am force-stop "$name2"
-			[[ $lxj -ge 95 ]] && echoRgb "$data空間不足,達到$lxj%" "0" && exit 2
+			[[ $lxj -ge 95 ]] && echoRgb "$hx空間不足,達到$lxj%" "0" && exit 2
 			echoRgb "備份$1數據" "2"
 			case $1 in
 			user)
diff --git a/本地一鍵更新腳本.sh b/本地一鍵更新腳本.sh
index fc91f7d..da3c66d 100644
--- a/本地一鍵更新腳本.sh
+++ b/本地一鍵更新腳本.sh
@@ -13,7 +13,9 @@ find "$MODDIR" -maxdepth 1 -name "*.zip" -type f | while read; do
 		case $MODDIR in
 		*Backup_*)
 			echoRgb "更新當前${MODDIR##*/}目錄下恢復相關腳本+tools目錄"
-			cp -r "$tools_path/script/Get_DirName" "$MODDIR/掃描資料夾名.sh" && cp -r "$tools_path/script/restore" "$MODDIR/還原備份.sh"
+			cp -r "$tools_path/script/Get_DirName" "$MODDIR/掃描資料夾名.sh"
+			cp -r "$tools_path/script/restore" "$MODDIR/還原備份.sh"
+			[[ -d $MODDIR/媒體 ]] && cp -r "$tools_path/script/restore3" "$MODDIR/媒體/恢復多媒體數據.sh"
 			find "$MODDIR" -maxdepth 1 -type d | sort | sed 's/\[/ /g ; s/\]//g' | while read; do
 				if [[ -f $REPLY/app_details ]]; then
 					unset PackageName
@@ -32,6 +34,8 @@ find "$MODDIR" -maxdepth 1 -name "*.zip" -type f | while read; do
 						cp -r "$tools_path" "$backup_path" && rm -rf "$backup_path/tools/bin/zip" "$backup_path/tools/META-INF" "$backup_path/tools/script"
 						cp -r "$tools_path/script/restore" "$backup_path/還原備份.sh"
 						cp -r "$tools_path/script/Get_DirName" "$backup_path/掃描資料夾名.sh"
+						cp -r "$MODDIR/本地一鍵更新腳本.sh" "$backup_path/本地一鍵更新腳本.sh"
+						[[ -d $backup_path/媒體 ]] && cp -r "$tools_path/script/restore3" "$backup_path/媒體/恢復多媒體數據.sh"
 						find "$MODDIR" -maxdepth 2 -type d | sort | sed 's/\[/ /g ; s/\]//g' | while read; do
 							if [[ -f $REPLY/app_details ]]; then
 								unset PackageName