bug fix

2021-11-03 22:31:00 +08:00
parent 9aa5cfec7c
commit e4722db208
7 changed files with 72 additions and 347 deletions
--- a/backup_settings.conf
+++ b/backup_settings.conf
@@ -21,9 +21,6 @@ Backup_obb_data=0
 #是否在應用數據備份好後備份自定義目錄
 backup_media=0

-#單獨生成可在recovery中用於救急備份的卡刷，並且跳過應用備份？
-Hybrid_backup=0
-
 #添加自定義備份路徑 請勿刪除" "
 Custom_path="
 /storage/emulated/0/Pictures
--- a/tools/META-INF/com/google/android/update-binary
+++ b/tools/META-INF/com/google/android/update-binary
@@ -1,251 +0,0 @@
-#!/sbin/sh
-#初始化
-OUTFD="$2"
-ZIPFILE="$3"
-
-#设置字符输出
-ui_print() {
-    echo "ui_print "$@"" > /proc/self/fd/$OUTFD
-}
-#设置工作目录
-MODDIR=/dev/backup
-#安装二进制文件
-rm -rf "$MODDIR"
-mkdir -p "$MODDIR"
-unzip -o "$ZIPFILE" 'apk/Message.apk' -d "$MODDIR"
-unzip -o "$ZIPFILE" 'bin/pv' -d "$MODDIR"
-unzip -o "$ZIPFILE" 'bin/bin.sh' -d "$MODDIR"
-unzip -o "$ZIPFILE" 'bin/busybox' -d "$MODDIR"
-unzip -o "$ZIPFILE" 'bin/appinfo' -d "$MODDIR"
-unzip -o "$ZIPFILE" 'bin/appinfo.dex' -d "$MODDIR"
-unzip -o "$ZIPFILE" 'bin/tar' -d "$MODDIR"
-unzip -o "$ZIPFILE" 'bin/zstd' -d "$MODDIR"
-unzip -o "$ZIPFILE" 'script/restore' -d "$MODDIR"
-unzip -o "$ZIPFILE" 'script/restore2' -d "$MODDIR"
-unzip -o "$ZIPFILE" 'script/Get_DirName' -d "$MODDIR"
-unzip -o "$ZIPFILE" 'script/應用列表.txt' -d "$MODDIR"
-unzip -o "$ZIPFILE" 'script/backup_settings.conf' -d "$MODDIR"
-chmod -R 0755 "$MODDIR/bin/"
-busybox="$MODDIR/bin/busybox"
-mkdir -p "$MODDIR/xbin"
-"$busybox" --list | while read; do
-	case $REPLY in
-	tar) ;;
-	*)
-		ln -s "$busybox" "$MODDIR/xbin/$REPLY"
-		;;
-	esac
-done
-isBoolean() {
-	nsx="$1"
-	if [[ $1 = 1 ]];then
-		nsx=true
-	elif [[ $1 = 0 ]];then
-		nsx=false
-	else
-		ui_print "script/backup_settings.conf填寫錯誤" && exit 2
-	fi
-}
-Set_back() {
-	return 1
-}
-#设置环境
-export PATH="$MODDIR/xbin:$MODDIR/bin:$PATH"
-. "$MODDIR/script/backup_settings.conf"
-i=1
-txt="$MODDIR/script/應用列表.txt"
-isBoolean "$Splist" && Splist="$nsx"
-isBoolean "$Backup_obb_data" && Backup_obb_data="$nsx"
-isBoolean "$Backup_user_data" && Backup_user_data="$nsx"
-[[ ! -f $txt ]] && ui_print "$txt缺少" && exit 1
-r="$(cat "$txt" | grep -v "#" | sed -e '/^$/d' | sed -n '$=')"
-[[ $r = "" ]] && ui_print "爬..應用列表.txt是空的備份個鬼" && exit 0
-path="/data/media/0/Android"
-path2="/data/data"
-data="/data"
-ui_print $(df -h "$data")
-ui_print $(df -h "$data" | awk 'END{print "剩餘:"$3"使用率:"$4}')
-Backup="/data/media/0/TWRP/Backup_$Compression_method"
-[[ ! -d $Backup ]] && mkdir -p "$Backup" || rm -rf "$Backup"/*
-[[ ! -f $Backup/應用列表.txt ]] && echo "#不需要恢復還原的應用請在開頭注釋# 比如#xxxxxxxx 酷安" >"$Backup/應用列表.txt"
-[[ ! -d $Backup/bin ]] && cp -r "$MODDIR/bin" "$Backup" && cp -r "$MODDIR/apk" "$Backup/bin"
-[[ ! -f $Backup/還原備份.sh ]] && cp -r "$MODDIR/script/restore" "$Backup/還原備份.sh"
-[[ ! -f $Backup/掃描資料夾名.sh ]] && cp -r "$MODDIR/script/Get_DirName" "$Backup/掃描資料夾名.sh"
-filesize="$(du -ks "$Backup" | awk '{print $1}')"
-#調用二進制
-Quantity=0
-#顯示執行結果
-echo_log() {
-	if [[ $? = 0 ]]; then
-		ui_print "$1成功" && result=0
-	else
-		ui_print "$1備份失敗，過世了" && result=1
-	fi
-}
-#檢測apk狀態進行備份
-Backup_apk() {
-	#創建APP備份文件夾
-	[[ ! -d $Backup_folder ]] && mkdir -p "$Backup_folder"
-	#備份apk
-	ui_print "$1"
-	[[ $lxj -ge 95 ]] && ui_print "$data空間不足,達到$lxj%" && exit 2
-	rm -rf "$Backup_folder"/*.apk
-	[[ $(cat "$Backup/應用列表.txt" | grep -v "#" | sed -e '/^$/d' | awk '{print $2}' | grep -w "^${name2}$" | head -1) = "" ]] && echo "$name1 $name2" >>"$Backup/應用列表.txt"
-	find "$apk_path" -maxdepth 1 -name "*.apk" -type f | while read; do
-		path="$REPLY"
-		b_size="$(ls -l "$path" | awk '{print $5}')"
-		k_size="$(awk 'BEGIN{printf "%.2f\n", "'$b_size'"/'1024'}')"
-		m_size="$(awk 'BEGIN{printf "%.2f\n", "'$k_size'"/'1024'}')"
-		ui_print "${path##*/} ${m_size}MB(${k_size}KB)"
-	done
-	(cd "$apk_path"
-	case $Compression_method in
-	tar|TAR|Tar) tar -cf "$Backup_folder/apk.tar" *.apk ;;
-	zstd|Zstd|ZSTD) tar -cf - *.apk | zstd -r -T0 -6 -q >"$Backup_folder/apk.tar.zst" ;;
-	esac)
-	echo_log "備份$apk_number個Apk"
-	if [[ $result = 0 ]]; then
-		[[ $PackageName = "" ]] && echo "PackageName=\"$name2\"" >>"$app_details"
-		[[ $ChineseName = "" ]] && echo "ChineseName=\"$name1\"" >>"$app_details"
-		[[ ! -f $Backup_folder/還原備份.sh ]] && cp -r "$MODDIR/script/restore2" "$Backup_folder/還原備份.sh"
-	fi
-	if [[ $name2 = com.android.chrome ]]; then
-		#刪除所有舊apk ,保留一個最新apk進行備份
-		ReservedNum=1
-		FileNum="$(ls /data/app/*/com.google.android.trichromelibrary_*/base.apk 2>/dev/null | wc -l)"
-		while [[ $FileNum -gt $ReservedNum ]]; do
-			OldFile="$(ls -rt /data/app/*/com.google.android.trichromelibrary_*/base.apk 2>/dev/null | head -1)"
-			ui_print "刪除文件:${OldFile%/*/*}"
-			rm -rf "${OldFile%/*/*}"
-			let "FileNum--"
-		done
-		[[ -f $(ls /data/app/*/com.google.android.trichromelibrary_*/base.apk 2>/dev/null) && $(ls /data/app/*/com.google.android.trichromelibrary_*/base.apk 2>/dev/null | wc -l) = 1 ]] && cp -r "$(ls /data/app/*/com.google.android.trichromelibrary_*/base.apk 2>/dev/null)" "$Backup_folder/nmsl.apk"
-	fi
-	[[ $name2 = bin.mt.plus && -f $apk_path/base.apk && ! -f $Backup/$name1.apk ]] && cp -r "$apk_path/base.apk" "$Backup/$name1.apk"
-	unset PackageName ChineseName ; D=1
-}
-#檢測數據位置進行備份
-Backup_data() {
-	unset  zsize
-	case $1 in
-	user) data_path="$path2/$name2" ;;
-	data) data_path="$path/$1/$name2" ;;
-	obb) data_path="$path/$1/$name2" ;;
-	*) [[ -f $app_details ]] && data_path="$2" && Compression_method=tar && zsize=1 ;;
-	esac
-	if [[ -d $data_path ]]; then
-		[[ $lxj -ge 95 ]] && ui_print "$data空間不足,達到$lxj%" && exit 2
-		ui_print "備份$1數據"
-		case $1 in
-		user)
-			case $Compression_method in
-			tar|Tar|TAR) tar --exclude="${data_path##*/}/.ota" --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/lib" -cpf "$Backup_folder/$1.tar" -C "${data_path%/*}" "${data_path##*/}" 2>/dev/null ;;
-			zstd|Zstd|ZSTD) tar --exclude="${data_path##*/}/.ota" --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/lib" -cpf - -C "${data_path%/*}" "${data_path##*/}" 2>/dev/null | zstd -r -T0 -6 -q >"$Backup_folder/$1.tar.zst" ;;
-			*) ui_print "$Compression_method為不支持的壓縮算法" && rm -rf "$Backup" && exit 2 ;;
-			esac ;;
-		*)
-			case $Compression_method in
-			tar|Tar|TAR) tar --exclude="Backup_"* -cPpf "$Backup_folder/$1.tar" "$data_path" 2>/dev/null ;;
-			zstd|Zstd|ZSTD) tar --exclude="Backup_"* -cPpf - "$data_path" 2>/dev/null | zstd -r -T0 -6 -q >"$Backup_folder/$1.tar.zst" ;;
-			*) ui_print "$Compression_method為不支持的壓縮算法" && rm -rf "$Backup" && exit 2 ;;
-			esac ;;
-		esac
-		echo_log "備份$1數據"
-	else
-		ui_print "$1數據不存在跳過備份"
-	fi
-}
-endtime() {
-	#計算總體切換時長耗費
-	case $1 in
-	1) starttime="$starttime1" ;;
-	2) starttime="$starttime2" ;;
-	esac
-	endtime="$(date -u "+%s")"
-	duration="$(echo "$((endtime - starttime))" | awk '{t=split("60 秒 60 分 24 時 999 天",a);for(n=1;n<t;n+=2){if($1==0)break;s=$1%a[n]a[n+1]s;$1=int($1/a[n])}print s}')"
-	[[ $duration != "" ]] && ui_print "$2用時:$duration" || ui_print "$2用時:0秒"
-}
-bn=37
-#開始循環$txt內的資料進行備份
-#記錄開始時間
-starttime1="$(date -u "+%s")"
-{
-while [[ $i -le $r ]]; do
-	ui_print "備份第$i個應用 總共$r個 剩下$((r-i))個應用"
-	name2="$(cat "$txt" | grep -v "#" | sed -e '/^$/d' | sed -n "${i}p" | awk '{print $2}')"
-	name1="$(cat "$txt" | grep -v "#" | sed -e '/^$/d' | sed -n "${i}p" | awk '{print $1}')"
-	lxj="$(df -h "$data" | awk 'END{print $4}' | sed 's/%//g')"
-	if [[ $name1 = *! || $name1 = *！ ]]; then
-		name1="$(echo "$name1" | sed 's/!//g ; s/！//g')"
-		ui_print "跳過備份$name1 所有數據"
-		No_backupdata=1
-	else
-		[[ $No_backupdata != "" ]] && unset No_backupdata
-	fi
-	Backup_folder="$Backup/$name1"
-	app_details="$Backup_folder/app_details"
-	if [[ -f $app_details ]]; then
-		. "$app_details"
-		if [[ $PackageName != $name2 ]]; then
-			unset ChineseName PackageName
-			Backup_folder="$Backup/${name1}[${name2}]"
-			app_details="$Backup_folder/app_details"
-			[[ -f $app_details ]] && . "$app_details"
-		fi
-	fi
-	[[ $name2 = "" ]] && ui_print "警告! 應用列表.txt應用包名獲取失敗，可能修改有問題" && exit 1
-	apk_path="$(cat "$txt" | grep -v "#" | sed -e '/^$/d' | sed -n "${i}p" | awk '{print $3}')"
-	if [[ -d $apk_path ]]; then
-		starttime2="$(date -u "+%s")"
-		ui_print "備份$name1 ($name2)"
-		[[ $name2 = com.tencent.mobileqq ]] && ui_print "QQ可能恢復備份失敗或是丟失聊天記錄，請自行用你信賴的軟件備份"
-		[[ $name2 = com.tencent.mm ]] && ui_print "WX可能恢復備份失敗或是丟失聊天記錄，請自行用你信賴的軟件備份"
-		apk_number="$(find "$apk_path" -maxdepth 1 -name "*.apk" -type f 2>/dev/null | wc -l)"
-		if [[ $apk_number = 1 ]]; then
-			if [[ $Splist = false ]]; then
-				Backup_apk "非Split Apk"
-			else
-				ui_print "非Split Apk跳過備份"
-				unset D
-			fi
-		else
-			Backup_apk "Split Apk支持備份"
-		fi
-		if [[ $D != ""  && $result = 0 && $No_backupdata = "" ]]; then
-			if [[ $Backup_obb_data = true ]]; then
-				#備份data數據
-				Backup_data "data"
-				#備份obb數據
-				Backup_data "obb"
-			fi
-			#備份user數據
-			[[ $Backup_user_data = true ]] && Backup_data "user"
-		fi
-		endtime 2 "$name1備份"
-		ui_print "完成$((i*100/r))% $hx$(df -h "$data" | awk 'END{print "剩餘:"$3"使用率:"$4}')"
-	else
-		ui_print "$name1[$name2]不在安裝列表，備份個寂寞？"
-	fi
-	ui_print "
-	"
-	let i++
-done
-#計算出備份大小跟差異性
-filesizee="$(du -ks "$Backup" | awk '{print $1}')"
-dsize="$(($((filesizee - filesize)) / 1024))"
-ui_print "備份資料夾路徑:$Backup"
-ui_print "備份資料夾總體大小$(du -ksh "$Backup" | awk '{print $1}')"
-if [[ $dsize -gt 0 ]]; then
-	if [[ $((dsize / 1024)) -gt 0 ]]; then
-		ui_print "本次備份: $((dsize / 1024))gb"
-	else
-		ui_print "本次備份: ${dsize}mb"
-	fi
-else
-	ui_print "本次備份: $(($((filesizee - filesize)) * 1000 / 1024))kb"
-fi
-ui_print "批量備份完成"
-endtime 1 "批量備份開始到結束"
-rm -rf "$MODDIR"
-exit 0
-}&
--- 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 2021/11/2-23:25"
+backup_version="V11.1 2021/11/3-22:25"
 #設置二進制命令目錄位置
 [[ $bin_path = "" ]] && echo "未正確指定bin.sh位置" && exit 2
 #bin_path="${bin_path/'/storage/emulated/'/'/data/media/'}"
--- a/tools/bin/zip
+++ b/tools/bin/zip
--- a/tools/script/restore
+++ b/tools/script/restore
@@ -46,7 +46,7 @@ Release_data() {
 		esac
 		;;
 	*)
-		[[ $FILE_NAME2 = thanox ]] && rm -rf "$(find "/data/system" -name "thanos_*" -maxdepth 1 -type d)"
+		[[ $FILE_NAME2 = thanox ]] && rm -rf "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)"
 		case ${FILE_NAME##*.} in
 		lz4) pv "$tar_path" | tar -I lz4 -xPpf - ;;
 		zst) pv "$tar_path" | tar -I zstd -xPpf - ;;
@@ -81,7 +81,7 @@ Release_data() {
 		elif [[ $FILE_NAME2 = data ]]; then
 			[[ -d $path/data/$name2 ]] && chown -R "1023:1078" "$path/data/$name2"
 		elif [[ $FILE_NAME2 = thanox ]]; then
-			restorecon -R "$(find "/data/system" -name "thanos_*" -maxdepth 1 -type d)" >/dev/null 2>&1
+			restorecon -R "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)" >/dev/null 2>&1
 			echo_log "selinux上下文設置" && echoRgb "警告 thanox配置恢復後務必重啟\n -否則不生效" "0"
 		fi
 	fi
--- a/tools/script/restore2
+++ b/tools/script/restore2
@@ -89,7 +89,7 @@ if [[ $Recovery_mode = true ]]; then
 					echoRgb "$X不存在 無法恢復$FILE_NAME2數據" "0" ; Set_back
 				fi
 			else
-				[[ $FILE_NAME2 = thanox ]] && rm -rf "$(find "/data/system" -name "thanos_*" -maxdepth 1 -type d)"
+				[[ $FILE_NAME2 = thanox ]] && rm -rf "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)"
 				case ${FILE_NAME##*.} in
 				lz4) pv "$tar_path" | tar --recursive-unlink -I lz4 -xmPpf - ;;
 				zst) pv "$tar_path" | tar --recursive-unlink -I zstd -xmPpf - ;;
@@ -122,7 +122,7 @@ if [[ $Recovery_mode = true ]]; then
 				elif [[ $FILE_NAME2 = data ]]; then
 					[[ -d $path/data/$name2 ]] && chown -R "1023:1078" "$path/data/$name2"
 				elif [[ $FILE_NAME2 = thanox ]]; then
-					restorecon -R "$(find "/data/system" -name "thanos_*" -maxdepth 1 -type d)" >/dev/null 2>&1
+					restorecon -R "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)" >/dev/null 2>&1
 					echo_log "selinux上下文設置" && echoRgb "警告 thanox配置恢復後務必重啟\n -否則不生效" "0"
 				fi
 			fi
@@ -131,6 +131,5 @@ if [[ $Recovery_mode = true ]]; then
 		echoRgb "$name2沒有安裝無法恢復數據" "0"
 	fi
 fi
-} &
-wait
-endtime 1 "恢複開始到結束" && echoRgb "應用閃退請重新開機" "0" && rm -rf "$TMPDIR"/*
+endtime 1 "恢複開始到結束" && echoRgb "應用閃退請重新開機" "0" && rm -rf "$TMPDIR"/*
+} &
--- a/備份應用.sh
+++ b/備份應用.sh
@@ -7,7 +7,6 @@ script="${0##*/}"
 [[ $(echo "$MODDIR" | grep -v 'mt') = "" ]] && echo "我他媽骨灰給你揚了撒了TM不解壓縮？用毛線 憨批" && exit 1
 [[ ! -d $tools_path ]] && echo "$tools_path目錄遺失" && exit 1
 [[ ! -d $script_path ]] && echo "$script_path目錄遺失" && exit 1
-[[ ! -d $tools_path/META-INF ]] && echo "$tools_path/META-INF目錄遺失" && exit 1
 [[ ! -d $tools_path/apk ]] && echo "$tools_path/apk目錄遺失" && exit 1
 . "$bin_path/bin.sh"
 . "$MODDIR/backup_settings.conf"
@@ -34,7 +33,6 @@ if [[ $Lo = false ]]; then
 	isBoolean "$path" && path3="$nsx"
 	isBoolean "$Backup_user_data" && Backup_user_data="$nsx"
 	isBoolean "$backup_media" && backup_media="$nsx"
-	isBoolean "$Hybrid_backup" && Hybrid_backup="$nsx"
 else
 	echoRgb "備份路徑位置為絕對位置或是當前環境位置\n 音量上當前環境位置，音量下腳本絕對位置"
 	get_version "當前環境位置" "腳本絕對位置" && path3="$branch"
@@ -82,12 +80,11 @@ else
 fi
 [[ $Backup_user_data = false ]] && echoRgb "當前backup_settings.conf的\n -Backup_user_data為0將不備份user數據" "0"
 [[ $Backup_obb_data = false ]] && echoRgb "當前backup_settings.conf的\n -Backup_obb_data為0將不備份外部數據" "0"
-[[ $Hybrid_backup = true ]] && echoRgb "當前backup_settings.conf的\n -Hybrid_backup為1將不備份任何應用" "0"
 [[ ! -d $Backup ]] && mkdir -p "$Backup"
 [[ ! -f $Backup/應用列表.txt ]] && echo "#不需要恢復還原的應用請在開頭注釋# 比如#xxxxxxxx 酷安" >"$Backup/應用列表.txt"
 [[ ! -f $Backup/本地一鍵更新腳本.sh ]] && cp -r "$MODDIR/本地一鍵更新腳本.sh" "$Backup"
 [[ ! -f $Backup/recover.conf ]] && cp -r "$script_path/recover.conf" "$Backup"
-[[ ! -d $Backup/tools ]] && cp -r "$tools_path" "$Backup" && rm -rf "$Backup/tools/bin/zip" "$Backup/tools/META-INF" "$Backup/tools/script"
+[[ ! -d $Backup/tools ]] && cp -r "$tools_path" "$Backup" && rm -rf "$Backup/tools/META-INF" "$Backup/tools/script"
 [[ ! -f $Backup/還原備份.sh ]] && cp -r "$script_path/restore" "$Backup/還原備份.sh"
 [[ ! -f $Backup/掃描資料夾名.sh ]] && cp -r "$script_path/Get_DirName" "$Backup/掃描資料夾名.sh"
 filesize="$(du -ks "$Backup" | awk '{print $1}')"
@@ -186,20 +183,6 @@ Backup_data() {
 		echoRgb "$1數據不存在跳過備份"
 	fi
 }
-recovery_backup() {
-	echo "$name1 $name2 $apk_path2" >>"$script_path/應用列表.txt"
-	if [[ $i = $r ]]; then
-		if [[ -f $tools_path/META-INF/com/google/android/update-binary ]]; then
-			echoRgb "輸出用於recovery的備份卡刷包" ; rm -rf "$MODDIR/recovery卡刷備份.zip" ; mkdir -p "$MODDIR/tmp"
-			tar -cpf - -C "$tools_path" "META-INF" "script" "bin" "apk" | tar --delete "script/restore3" --delete "bin/busybox_path" --delete "bin/lz4" --delete "bin/zip" | pv | tar --recursive-unlink -xmpf - -C "$MODDIR/tmp"
-			(cd "$MODDIR/tmp" && zip -r "recovery卡刷備份.zip" *)
-			echo_log "打包卡刷包"
-			[[ $result = 0 ]] && (mv "$MODDIR/tmp/recovery卡刷備份.zip" "$MODDIR" && rm -rf "$MODDIR/tmp" "$script_path/應用列表.txt" ; echoRgb "輸出:$MODDIR/recovery卡刷備份.zip" "2")
-		else
-			echoRgb "update-binary卡刷腳本遺失" "0"
-		fi
-	fi
-}
 [[ $Lo = true ]] && {
 echoRgb "選擇是否只備份split apk(分割apk檔)\n 如果你不知道這意味什麼請選擇音量下進行混合備份\n 音量上是，音量下不是"
 get_version "是" "不是，混合備份" && Splist="$branch"
@@ -209,8 +192,6 @@ echoRgb "是否備份使用者數據\n 音量上備份，音量下不備份"
 get_version "備份" "不備份" && Backup_user_data="$branch"
 echoRgb "全部應用備份結束後是否備份自定義目錄\n 音量上備份，音量下不備份"
 get_version "備份" "不備份" && backup_media="$branch"
-echoRgb "單獨生成可供recovery中救急備份的卡刷包？\n 音量上生成，音量下備份應用+生成(混合)"
-get_version "單獨生成" "備份應用+卡刷包" && Hybrid_backup="$branch"
 }
 echo "#不需要恢復還原的應用請在開頭注釋# 比如#xxxxxxxx 酷安" >"$script_path/應用列表.txt"
 #開始循環$txt內的資料進行備份
@@ -227,80 +208,79 @@ while [[ $i -le $r ]]; do
 	apk_path="$(pm path "$name2" | cut -f2 -d ':')"
 	apk_path2="$(echo "$apk_path" | head -1)" ; apk_path2="${apk_path2%/*}"
 	if [[ -d $apk_path2 ]]; then
-		if [[ $Hybrid_backup = false ]]; then
-			echoRgb "備份第$i個應用 總共$r個 剩下$((r-i))個應用"
-			if [[ $name1 = *! || $name1 = *！ ]]; then
-				name1="$(echo "$name1" | sed 's/!//g ; s/！//g')"
-				echoRgb "跳過備份$name1 所有數據" "0"
-				No_backupdata=1
-			else
-				[[ $No_backupdata != "" ]] && unset No_backupdata
-			fi
-			Backup_folder="$Backup/$name1"
-			app_details="$Backup_folder/app_details"
-			if [[ -f $app_details ]]; then
-				. "$app_details"
-				if [[ $PackageName != $name2 ]]; then
-					unset userSize ChineseName PackageName apk_version
-					Backup_folder="$Backup/${name1}[${name2}]"
-					app_details="$Backup_folder/app_details"
-					[[ -f $app_details ]] && . "$app_details"
-				fi
-			fi
-			lxj="$(df -h "$data" | awk 'END{print $4}' | sed 's/%//g')"
-			starttime2="$(date -u "+%s")"
-			echoRgb "備份$name1 ($name2)"
-			[[ $name2 = com.tencent.mobileqq ]] && echo "QQ可能恢復備份失敗或是丟失聊天記錄，請自行用你信賴的應用備份"
-			[[ $name2 = com.tencent.mm ]] && echo "WX可能恢復備份失敗或是丟失聊天記錄，請自行用你信賴的應用備份"
-			apk_number="$(echo "$apk_path" | wc -l)"
-			if [[ $apk_number = 1 ]]; then
-				if [[ $Splist = false ]]; then
-					Backup_apk "非Split Apk"
-				else
-					echoRgb "非Split Apk跳過備份" && unset D
-				fi
-			else
-				Backup_apk "Split Apk支持備份"
-			fi
-			if [[ $D != ""  && $result = 0 && $No_backupdata = "" ]]; then
-				if [[ $Backup_obb_data = true ]]; then
-					#備份data數據
-					Backup_data "data"
-					#備份obb數據
-					Backup_data "obb"
-				fi
-				#備份user數據
-				[[ $Backup_user_data = true ]] && Backup_data "user"
-				[[ $name2 = github.tornaco.android.thanos ]] && Backup_data "thanox" "$(find "/data/system" -name "thanos_*" -maxdepth 1 -type d)"
-			fi
-			endtime 2 "$name1備份"
-			echoRgb "完成$((i*100/r))% $hx$(df -h "$data" | awk 'END{print "剩餘:"$3"使用率:"$4}')"
-			echoRgb "____________________________________" "3"
-			recovery_backup
+		echoRgb "備份第$i個應用 總共$r個 剩下$((r-i))個應用"
+		if [[ $name1 = *! || $name1 = *！ ]]; then
+			name1="$(echo "$name1" | sed 's/!//g ; s/！//g')"
+			echoRgb "跳過備份$name1 所有數據" "0"
+			No_backupdata=1
 		else
-			recovery_backup
+			[[ $No_backupdata != "" ]] && unset No_backupdata
 		fi
+		Backup_folder="$Backup/$name1"
+		app_details="$Backup_folder/app_details"
+		if [[ -f $app_details ]]; then
+			. "$app_details"
+			if [[ $PackageName != $name2 ]]; then
+				unset userSize ChineseName PackageName apk_version
+				Backup_folder="$Backup/${name1}[${name2}]"
+				app_details="$Backup_folder/app_details"
+				[[ -f $app_details ]] && . "$app_details"
+			fi
+		fi
+		lxj="$(df -h "$data" | awk 'END{print $4}' | sed 's/%//g')"
+		starttime2="$(date -u "+%s")"
+		echoRgb "備份$name1 ($name2)"
+		[[ $name2 = com.tencent.mobileqq ]] && echo "QQ可能恢復備份失敗或是丟失聊天記錄，請自行用你信賴的應用備份"
+		[[ $name2 = com.tencent.mm ]] && echo "WX可能恢復備份失敗或是丟失聊天記錄，請自行用你信賴的應用備份"
+		apk_number="$(echo "$apk_path" | wc -l)"
+		if [[ $apk_number = 1 ]]; then
+			if [[ $Splist = false ]]; then
+				Backup_apk "非Split Apk"
+			else
+				echoRgb "非Split Apk跳過備份" && unset D
+			fi
+		else
+			Backup_apk "Split Apk支持備份"
+		fi
+		if [[ $D != ""  && $result = 0 && $No_backupdata = "" ]]; then
+			if [[ $Backup_obb_data = true ]]; then
+				#備份data數據
+				Backup_data "data"
+				#備份obb數據
+				Backup_data "obb"
+			fi
+			#備份user數據
+			[[ $Backup_user_data = true ]] && Backup_data "user"
+			[[ $name2 = github.tornaco.android.thanos ]] && Backup_data "thanox" "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)"
+		fi
+		endtime 2 "$name1備份"
+		echoRgb "完成$((i*100/r))% $hx$(df -h "$data" | awk 'END{print "剩餘:"$3"使用率:"$4}')"
+		echoRgb "____________________________________" "3"
 	else
 		echoRgb "$name1[$name2]不在安裝列表，備份個寂寞？" "0"
 	fi
 	if [[ $i = $r ]]; then
 		endtime 1 "應用備份"
-		if [[ $backup_media = true && $Hybrid_backup = false ]]; then
-			echoRgb "備份結束，備份多媒體"
-			starttime1="$(date -u "+%s")"
-			Backup_folder="$Backup/媒體"
+		if [[ $backup_media = true ]]; then
 			A=1
 			B="$(echo "$Custom_path" | grep -v "#" | sed -e '/^$/d' | sed -n '$=')"
-			[[ ! -d $Backup_folder ]] && mkdir -p "$Backup_folder"
-			[[ ! -f $Backup_folder/恢復多媒體數據.sh ]] && cp -r "$script_path/restore3" "$Backup_folder/恢復多媒體數據.sh"
-			app_details="$Backup_folder/app_details"
-			[[ -f $app_details ]] && . "$app_details"
-			echo "$Custom_path" | grep -v "#" | sed -e '/^$/d' | while read; do
-				echoRgb "備份第$A個資料夾 總共$B個 剩下$((B-A))個"
-				Backup_data "${REPLY##*/}" "$REPLY"
-				echoRgb "完成$((A*100/B))% $hx$(df -h "$data" | awk 'END{print "剩餘:"$3"使用率:"$4}')" && let A++
-			done
-			endtime 1 "自定義備份"
+			if [[ $B != "" ]]; then
+				echoRgb "備份結束，備份多媒體"
+				starttime1="$(date -u "+%s")"
+				Backup_folder="$Backup/媒體"
+				[[ ! -d $Backup_folder ]] && mkdir -p "$Backup_folder"
+				[[ ! -f $Backup_folder/恢復多媒體數據.sh ]] && cp -r "$script_path/restore3" "$Backup_folder/恢復多媒體數據.sh"
+				app_details="$Backup_folder/app_details"
+				[[ -f $app_details ]] && . "$app_details"
+				echo "$Custom_path" | grep -v "#" | sed -e '/^$/d' | while read; do
+					echoRgb "備份第$A個資料夾 總共$B個 剩下$((B-A))個"
+					Backup_data "${REPLY##*/}" "$REPLY"
+					echoRgb "完成$((A*100/B))% $hx$(df -h "$data" | awk 'END{print "剩餘:"$3"使用率:"$4}')" && let A++
+				done
+				endtime 1 "自定義備份"
+			else
+				echoRgb "自定義路徑為空 無法備份" "0"
+			fi
 		fi
 	fi
 	let i++ en++ nskg++