bug fix

2022-01-01 14:47:43 +08:00
parent 55f549d047
commit 548fc19822
6 changed files with 447 additions and 395 deletions
--- a/backup.sh
+++ b/backup.sh
@@ -4,23 +4,23 @@ tools_path="$MODDIR/tools"
 bin_path="$tools_path/bin"
 script_path="$tools_path/script"
 script="${0##*/}"
-[[ $(echo "$MODDIR" | grep -v 'mt') = "" ]] && echo "我他媽骨灰給你揚了撒了TM不解壓縮？用毛線 憨批" && exit 1
+[[ $(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/apk ]] && echo "$tools_path/apk目錄遺失" && exit 1
 . "$bin_path/bin.sh"
 . "$MODDIR/backup_settings.conf"
 case $MODDIR in
-/storage/emulated/0/Android/*|/data/media/0/Android/*|/sdcard/Android/*) echoRgb "請勿在$MODDIR內備份" "0" && exit 2 ;;
+/storage/emulated/0/Android/* | /data/media/0/Android/* | /sdcard/Android/*) echoRgb "請勿在$MODDIR內備份" "0" && exit 2 ;;
 esac
 case $Compression_method in
-zstd|Zstd|ZSTD|tar|Tar|TAR|lz4|Lz4|LZ4) ;;
+zstd | Zstd | ZSTD | tar | Tar | TAR | lz4 | Lz4 | LZ4) ;;
 *) echoRgb "$Compression_method為不支持的壓縮算法" "0" && exit 2 ;;
 esac
 [[ ! -f $MODDIR/backup_settings.conf ]] && echoRgb "backup_settings.conf遺失" "0" && exit 1
 #效驗選填是否正確
 isBoolean "$Lo" && Lo="$nsx"
-if [[ $Lo = false ]]; then
+if [[ $Lo == false ]]; then
 	isBoolean "$Splist" && Splist="$nsx"
 	isBoolean "$USBdefault" && USBdefault="$nsx"
 	isBoolean "$Backup_obb_data" && Backup_obb_data="$nsx"
@@ -36,7 +36,7 @@ if [[ $Output_path != "" ]]; then
 	echoRgb "使用自定義目錄\n -輸出位置:$Output_path" && Backup="$Output_path/Backup_$Compression_method"
 else
 	Backup="$MODDIR/Backup_$Compression_method"
-	if [[ $APP_ENV = 1 ]]; then
+	if [[ $APP_ENV == 1 ]]; then
 		Backup="/data/media/0/Download/Backup_$Compression_method"
 		echoRgb "沒有設定備份目錄 使用默認路徑\n $Backup"
 	fi
@@ -48,7 +48,7 @@ if [[ ! -f $txt ]]; then
 else
 	cat "$txt" | grep -v "#" | while read; do
 		name=($REPLY $REPLY)
-		if [[ $REPLY != "" && $(pm path "${name[1]}" | cut -f2 -d ':') = "" ]]; then
+		if [[ $REPLY != "" && $(pm path "${name[1]}" | cut -f2 -d ':') == "" ]]; then
 			echoRgb "${name[2]}不存在系統，從列表中刪除"
 			cat "$txt" | sed -e "s/$REPLY//g ; /^$/d" >"$txt.tmp" && mv "$txt.tmp" "$txt"
 		fi
@@ -56,7 +56,7 @@ else
 	cat "$txt" | sed -e '/^$/d' >"$txt.tmp" && mv "$txt.tmp" "$txt"
 fi
 r="$(cat "$txt" | grep -v "#" | sed -e '/^$/d' | sed -n '$=')"
-[[ $r = "" ]] && echoRgb "爬..appList.txt是空的或是包名被注釋了這樣備份個鬼" "0" && exit 1
+[[ $r == "" ]] && echoRgb "爬..appList.txt是空的或是包名被注釋了這樣備份個鬼" "0" && exit 1
 data=/data
 hx="本地"
 echoRgb "壓縮方式:$Compression_method"
@@ -64,35 +64,37 @@ echoRgb "提示 腳本支持後台壓縮 可以直接離開腳本\n -或是關
 if [[ $PU != "" ]]; then
 	[[ -f /proc/mounts ]] && PT="$(cat /proc/mounts | grep "$PU" | awk '{print $2}')"
 	if [[ -d $PT ]]; then
-		if [[ $(echo "$MODDIR" | grep -oE "^${PT}") != "" || $USBdefault = true ]]; then
+		if [[ $(echo "$MODDIR" | grep -oE "^${PT}") != "" || $USBdefault == true ]]; then
 			hx="USB"
 		else
 			echoRgb "檢測到隨身碟 是否在隨身碟備份\n -音量上是，音量下不是"
 			get_version "選擇了隨身碟備份" "選擇了本地備份"
-			[[ $branch = true ]] && hx="USB"
+			[[ $branch == true ]] && hx="USB"
 		fi
-		if [[ $hx = USB ]]; then
+		if [[ $hx == USB ]]; then
 			Backup="$PT/Backup_$Compression_method"
 			data="/dev/block/vold/$PU"
 			mountinfo="$(df -T "$data" | awk 'END{print $1}')"
 			case $mountinfo in
-			fuseblk|exfat|NTFS|ext4)
+			fuseblk | exfat | NTFS | ext4)
 				echoRgb "於隨身碟備份 檔案系統:$mountinfo" "1"
 				;;
 			*)
-				echoRgb "隨身碟檔案系統$mountinfo不支持超過單檔4GB\n -請格式化為exfat" "0" ; exit 1 ;;
+				echoRgb "隨身碟檔案系統$mountinfo不支持超過單檔4GB\n -請格式化為exfat" "0"
+				exit 1
+				;;
 			esac
 		fi
 	fi
 else
 	echoRgb "沒有檢測到隨身碟於本地備份" "1"
 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"
-[[ $backup_media = false ]] && echoRgb "當前backup_settings.conf的\n -backup_media為0將不備份自定義資料夾" "0"
+[[ $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"
+[[ $backup_media == false ]] && echoRgb "當前backup_settings.conf的\n -backup_media為0將不備份自定義資料夾" "0"
 [[ ! -d $Backup ]] && mkdir -p "$Backup"
 txt2="$Backup/appList.txt"
-[[ ! -f $txt2 ]] && echo "#不需要恢復還原的應用請在開頭注釋# 比如#xxxxxxxx 酷安" >"$txt2"
+[[ ! -f $txt2 ]] && echo "#不需要備份的應用請在開頭注釋# 比如#酷安 xxxxxxxx\n#不需要恢復數據比如酷安! xxxxxxxx應用名後方加一個驚嘆號即可 注意是應用名不是包名" >"$txt2"
 [[ ! -d $Backup/tools ]] && cp -r "$tools_path" "$Backup" && rm -rf "$Backup/tools/bin/zip" "$Backup/tools/script"
 [[ ! -f $Backup/Restorebackup.sh ]] && cp -r "$script_path/restore" "$Backup/Restorebackup.sh"
 [[ ! -f $Backup/DumpName.sh ]] && cp -r "$script_path/Get_DirName" "$Backup/DumpName.sh"
@@ -103,19 +105,22 @@ Quantity=0
 Backup_apk() {
 	#創建APP備份文件夾
 	[[ ! -d $Backup_folder ]] && mkdir -p "$Backup_folder"
-	if [[ $apk_version = $(dumpsys package "$name2" | awk '/versionName=/{print $1}' | cut -f2 -d '=' | head -1) ]]; then
-		unset xb ; result=0
+	if [[ $apk_version == $(dumpsys package "$name2" | awk '/versionName=/{print $1}' | cut -f2 -d '=' | head -1) ]]; then
+		unset xb
+		result=0
 		echoRgb "Apk版本無更新 跳過備份"
 	else
 		case $name2 in
 		com.google.android.youtube)
-			[[ -d /data/adb/Vanced ]] && nobackup="true" ;;
+			[[ -d /data/adb/Vanced ]] && nobackup="true"
+			;;
 		com.google.android.apps.youtube.music)
-			[[ -d /data/adb/Music ]] && nobackup="true" ;;
+			[[ -d /data/adb/Music ]] && nobackup="true"
+			;;
 		esac
 		if [[ $nobackup != true ]]; then
 			[[ $lxj -ge 95 ]] && echoRgb "$hx空間不足,達到$lxj%" "0" && exit 2
-			[[ $(cat "$txt2" | grep -v "#" | sed -e '/^$/d' | awk '{print $2}' | grep -w "^${name2}$" | head -1) = "" ]] && echo "${Backup_folder##*/} $name2" >>"$txt2"
+			[[ $(cat "$txt2" | grep -v "#" | sed -e '/^$/d' | awk '{print $2}' | grep -w "^${name2}$" | head -1) == "" ]] && echo "${Backup_folder##*/} $name2" >>"$txt2"
 			rm -rf "$Backup_folder"/*.apk
 			#備份apk
 			echoRgb "$1"
@@ -127,22 +132,22 @@ Backup_apk() {
 				m_size="$(awk 'BEGIN{printf "%.2f\n", "'$k_size'"/'1024'}')"
 				echoRgb "${path##*/} ${m_size}MB(${k_size}KB)" "2"
 			done
-			(cd "$apk_path2"
+			(
+				cd "$apk_path2"
 				case $Compression_method in
-			tar|TAR|Tar) tar -cf "$Backup_folder/apk.tar" *.apk ;;
-			lz4|LZ4|Lz4) tar -cf - *.apk | lz4 -1 >"$Backup_folder/apk.tar.lz4" ;;
-			zstd|Zstd|ZSTD) tar -cf - *apk | zstd -r -T0 --ultra -6 -q >"$Backup_folder/apk.tar.zst" ;;
-			esac)
+				tar | TAR | Tar) tar -cf "$Backup_folder/apk.tar" *.apk ;;
+				lz4 | LZ4 | Lz4) tar -cf - *.apk | lz4 -1 >"$Backup_folder/apk.tar.lz4" ;;
+				zstd | Zstd | ZSTD) tar -cf - *apk | zstd -r -T0 --ultra -6 -q >"$Backup_folder/apk.tar.zst" ;;
+				esac
+			)
 			echo_log "備份$apk_number個Apk"
-			if [[ $result = 0 ]]; then
+			if [[ $result == 0 ]]; then
 				echo "apk_version=\"$(dumpsys package "$name2" | awk '/versionName=/{print $1}' | cut -f2 -d '=' | head -1)\"" >>"$app_details"
-				[[ $PackageName = "" ]] && echo "PackageName=\"$name2\"" >>"$app_details"
-				[[ $ChineseName = "" ]] && echo "ChineseName=\"$name1\"" >>"$app_details"
+				[[ $PackageName == "" ]] && echo "PackageName=\"$name2\"" >>"$app_details"
+				[[ $ChineseName == "" ]] && echo "ChineseName=\"$name1\"" >>"$app_details"
 				[[ ! -f $Backup_folder/Restorebackup.sh ]] && cp -r "$script_path/restore2" "$Backup_folder/Restorebackup.sh"
-				[[ ! -f $Backup_folder/recover.conf ]] && cp -r "$script_path/recover.conf" "$Backup_folder"
-				[[ ! -f $Backup/recover.conf ]] && cp -r "$script_path/recover.conf" "$Backup"
 			fi
-			if [[ $name2 = com.android.chrome ]]; then
+			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)"
@@ -151,14 +156,14 @@ Backup_apk() {
 					rm -rf "${OldFile%/*/*}" && echoRgb "刪除文件:${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"
+				[[ -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
 		else
 			echoRgb "$name不支持備份 需要使用vanced安裝" "0" && rm -rf "$Backup_folder"
 		fi
 	fi
-	[[ $name2 = bin.mt.plus && ! -f $Backup/$name1.apk ]] && cp -r "$apk_path" "$Backup/$name1.apk"
-	unset ChineseName PackageName ; D=1
+	[[ $name2 == bin.mt.plus && ! -f $Backup/$name1.apk ]] && cp -r "$apk_path" "$Backup/$name1.apk"
+	D=1
 }
 #檢測數據位置進行備份
 Backup_data() {
@@ -167,7 +172,13 @@ Backup_data() {
 	user) Size="$userSize" && data_path="$path2/$name2" ;;
 	data) Size="$dataSize" && data_path="$path/$1/$name2" ;;
 	obb) Size="$obbSize" && data_path="$path/$1/$name2" ;;
-	*) [[ -f $app_details ]] && Size="$(cat "$app_details" | awk "/$1Size/"'{print $1}' | cut -f2 -d '=' | tail -n1 | sed 's/\"//g')" ; data_path="$2" ; Compression_method1="$Compression_method" ; Compression_method=tar ; zsize=1
+	*)
+		[[ -f $app_details ]] && Size="$(cat "$app_details" | awk "/$1Size/"'{print $1}' | cut -f2 -d '=' | tail -n1 | sed 's/\"//g')"
+		data_path="$2"
+		Compression_method1="$Compression_method"
+		Compression_method=tar
+		zsize=1
+		;;
 	esac
 	if [[ -d $data_path ]]; then
 		if [[ $Size != $(du -ks "$data_path" | awk '{print $1}') ]]; then
@@ -177,19 +188,23 @@ Backup_data() {
 			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 - -C "${data_path%/*}" "${data_path##*/}" 2>/dev/null | pv -f >"$Backup_folder/$1.tar" ;;
-				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 | pv -f | zstd -r -T0 --ultra -6 -q >"$Backup_folder/$1.tar.zst" ;;
-				lz4|Lz4|LZ4) tar --exclude="${data_path##*/}/.ota" --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/lib" -cpf - -C "${data_path%/*}" "${data_path##*/}" 2>/dev/null | pv -f | lz4 -1 >"$Backup_folder/$1.tar.lz4" ;;
-				esac ;;
+				tar | Tar | TAR) tar --exclude="${data_path##*/}/.ota" --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/lib" -cpf - -C "${data_path%/*}" "${data_path##*/}" 2>/dev/null | pv -f -f -f -f -f -f -f -f -f -f -f -f >"$Backup_folder/$1.tar" ;;
+				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 | pv -f -f -f -f -f -f -f -f -f -f -f -f | zstd -r -T0 --ultra -6 -q >"$Backup_folder/$1.tar.zst" ;;
+				lz4 | Lz4 | LZ4) tar --exclude="${data_path##*/}/.ota" --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/lib" -cpf - -C "${data_path%/*}" "${data_path##*/}" 2>/dev/null | pv -f -f -f -f -f -f -f -f -f -f -f -f | lz4 -1 >"$Backup_folder/$1.tar.lz4" ;;
+				esac
+				;;
 			*)
 				case $Compression_method in
-				tar|Tar|TAR) tar --exclude="Backup_"* --exclude="${data_path##*/}/cache" -cPpf - "$data_path" 2>/dev/null | pv -f >"$Backup_folder/$1.tar" ;;
-				zstd|Zstd|ZSTD) tar --exclude="Backup_"* --exclude="${data_path##*/}/cache" -cPpf - "$data_path" 2>/dev/null | pv -f | zstd -r -T0 --ultra -6 -q >"$Backup_folder/$1.tar.zst" ;;
-				lz4|Lz4|LZ4) tar --exclude="Backup_"* --exclude="${data_path##*/}/cache" -cPpf - "$data_path" 2>/dev/null | pv -f | lz4 -1 >"$Backup_folder/$1.tar.lz4" ;;
-				esac ; [[ $Compression_method1 != "" ]] && Compression_method="$Compression_method1" ; unset Compression_method1 ;;
+				tar | Tar | TAR) tar --exclude="Backup_"* --exclude="${data_path##*/}/cache" -cPpf - "$data_path" 2>/dev/null | pv -f -f -f -f -f -f -f -f -f -f -f -f >"$Backup_folder/$1.tar" ;;
+				zstd | Zstd | ZSTD) tar --exclude="Backup_"* --exclude="${data_path##*/}/cache" -cPpf - "$data_path" 2>/dev/null | pv -f -f -f -f -f -f -f -f -f -f -f -f | zstd -r -T0 --ultra -6 -q >"$Backup_folder/$1.tar.zst" ;;
+				lz4 | Lz4 | LZ4) tar --exclude="Backup_"* --exclude="${data_path##*/}/cache" -cPpf - "$data_path" 2>/dev/null | pv -f -f -f -f -f -f -f -f -f -f -f -f | lz4 -1 >"$Backup_folder/$1.tar.lz4" ;;
+				esac
+				[[ $Compression_method1 != "" ]] && Compression_method="$Compression_method1"
+				unset Compression_method1
+				;;
 			esac
 			echo_log "備份$1數據"
-			if [[ $result = 0 ]]; then
+			if [[ $result == 0 ]]; then
 				if [[ $zsize != "" ]]; then
 					echo "#$1Size=\"$(du -ks "$data_path" | awk '{print $1}')\"" >>"$app_details"
 					[[ $2 != $(cat "$app_details" | awk "/$1path/"'{print $1}' | cut -f2 -d '=' | tail -n1 | sed 's/\"//g') ]] && echo "#$1path=\"$2\"" >>"$app_details"
@@ -208,15 +223,15 @@ Backup_data() {
 		fi
 	fi
 }
-[[ $Lo = true ]] && {
-echoRgb "選擇是否只備份split apk(分割apk檔)\n -如果你不知道這意味什麼請選擇音量下進行混合備份\n 音量上是，音量下不是"
-get_version "是" "不是，混合備份" && Splist="$branch"
-echoRgb "是否備份外部數據 即比如原神的數據包\n -音量上備份，音量下不備份"
-get_version "備份" "不備份" && Backup_obb_data="$branch"
-echoRgb "是否備份使用者數據\n -音量上備份，音量下不備份"
-get_version "備份" "不備份" && Backup_user_data="$branch"
-echoRgb "全部應用備份結束後是否備份自定義目錄\n -音量上備份，音量下不備份"
-get_version "備份" "不備份" && backup_media="$branch"
+[[ $Lo == true ]] && {
+	echoRgb "選擇是否只備份split apk(分割apk檔)\n -如果你不知道這意味什麼請選擇音量下進行混合備份\n 音量上是，音量下不是"
+	get_version "是" "不是，混合備份" && Splist="$branch"
+	echoRgb "是否備份外部數據 即比如原神的數據包\n -音量上備份，音量下不備份"
+	get_version "備份" "不備份" && Backup_obb_data="$branch"
+	echoRgb "是否備份使用者數據\n -音量上備份，音量下不備份"
+	get_version "備份" "不備份" && Backup_user_data="$branch"
+	echoRgb "全部應用備份結束後是否備份自定義目錄\n -音量上備份，音量下不備份"
+	get_version "備份" "不備份" && backup_media="$branch"
 }
 #開始循環$txt內的資料進行備份
 #記錄開始時間
@@ -224,21 +239,21 @@ starttime1="$(date -u "+%s")"
 TIME="$starttime1"
 en=118
 {
-while [[ $i -le $r ]]; do
+	while [[ $i -le $r ]]; do
 		[[ $en -ge 229 ]] && en=118
 		name1="$(cat "$txt" | grep -v "#" | sed -e '/^$/d' | sed -n "${i}p" | awk '{print $1}')"
 		name2="$(cat "$txt" | grep -v "#" | sed -e '/^$/d' | sed -n "${i}p" | awk '{print $2}')"
-	[[ $name2 = "" ]] && echoRgb "警告! appList.txt應用包名獲取失敗，可能修改有問題" "0" && exit 1
+		[[ $name2 == "" ]] && echoRgb "警告! appList.txt應用包名獲取失敗，可能修改有問題" "0" && exit 1
 		apk_path="$(pm path "$name2" | cut -f2 -d ':')"
-	apk_path2="$(echo "$apk_path" | head -1)" ; apk_path2="${apk_path2%/*}"
+		apk_path2="$(echo "$apk_path" | head -1)"
+		apk_path2="${apk_path2%/*}"
 		if [[ -d $apk_path2 ]]; then
-		echoRgb "備份第$i/$r個應用 剩下$((r-i))個"
-		if [[ $name1 = *! || $name1 = *！ ]]; then
+			echoRgb "備份第$i/$r個應用 剩下$((r - i))個"
+			unset ChineseName PackageName nobackup No_backupdata
+			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"
@@ -253,15 +268,14 @@ while [[ $i -le $r ]]; do
 			fi
 			Occupation_status="$(df -h "$data" | cut -f3 -d 'use' | cut -f1 -d '%')%"
 			lxj="$(echo "$Occupation_status" | awk '{print $5}' | sed 's/%//g')"
-		[[ $hx = USB && $PT = "" ]] && echoRgb "隨身碟意外斷開 請檢查穩定性" "0" && exit 1
+			[[ $hx == USB && $PT == "" ]] && echoRgb "隨身碟意外斷開 請檢查穩定性" "0" && exit 1
 			starttime2="$(date -u "+%s")"
 			echoRgb "備份$name1 ($name2)"
-		[[ $name2 = com.tencent.mobileqq ]] && echoRgb "QQ可能恢復備份失敗或是丟失聊天記錄，請自行用你信賴的應用備份" "0"
-		[[ $name2 = com.tencent.mm ]] && echoRgb "WX可能恢復備份失敗或是丟失聊天記錄，請自行用你信賴的應用備份" "0"
-		unset nobackup
+			[[ $name2 == com.tencent.mobileqq ]] && echoRgb "QQ可能恢復備份失敗或是丟失聊天記錄，請自行用你信賴的應用備份" "0"
+			[[ $name2 == com.tencent.mm ]] && echoRgb "WX可能恢復備份失敗或是丟失聊天記錄，請自行用你信賴的應用備份" "0"
 			apk_number="$(echo "$apk_path" | wc -l)"
-		if [[ $apk_number = 1 ]]; then
-			if [[ $Splist = false ]]; then
+			if [[ $apk_number == 1 ]]; then
+				if [[ $Splist == false ]]; then
 					Backup_apk "非Split Apk"
 				else
 					echoRgb "非Split Apk跳過備份" && unset D
@@ -269,26 +283,26 @@ while [[ $i -le $r ]]; do
 			else
 				Backup_apk "Split Apk支持備份"
 			fi
-		if [[ $D != ""  && $result = 0 && $No_backupdata = "" && $nobackup != true ]]; then
-			if [[ $Backup_obb_data = true ]]; then
+			if [[ $D != "" && $result == 0 && $No_backupdata == "" && $nobackup != true ]]; 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)"
+				[[ $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$(echo "$Occupation_status" | awk 'END{print "剩餘:"$4"使用率:"$5}')"
+			echoRgb "完成$((i * 100 / r))% $hx$(echo "$Occupation_status" | awk 'END{print "剩餘:"$4"使用率:"$5}')"
 			echoRgb "____________________________________" "3"
 		else
 			echoRgb "$name1[$name2]不在安裝列表，備份個寂寞？" "0"
 		fi
-	if [[ $i = $r ]]; then
+		if [[ $i == $r ]]; then
 			endtime 1 "應用備份"
-		if [[ $backup_media = true ]]; then
+			if [[ $backup_media == true ]]; then
 				A=1
 				B="$(echo "$Custom_path" | grep -v "#" | sed -e '/^$/d' | sed -n '$=')"
 				if [[ $B != "" ]]; then
@@ -300,11 +314,11 @@ while [[ $i -le $r ]]; do
 					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))個"
+						echoRgb "備份第$A/$B個資料夾 剩下$((B - A))個"
 						starttime2="$(date -u "+%s")"
 						Backup_data "${REPLY##*/}" "$REPLY"
 						endtime 2 "${REPLY##*/}備份"
-					echoRgb "完成$((A*100/B))% $hx$(echo "$Occupation_status" | awk 'END{print "剩餘:"$4"使用率:"$5}')" && echoRgb "____________________________________" "3" && let A++
+						echoRgb "完成$((A * 100 / B))% $hx$(echo "$Occupation_status" | awk 'END{print "剩餘:"$4"使用率:"$5}')" && echoRgb "____________________________________" "3" && let A++
 					done
 					endtime 1 "自定義備份"
 				else
@@ -313,27 +327,27 @@ while [[ $i -le $r ]]; do
 			fi
 		fi
 		let i++ en++ nskg++
-done
-rm -rf "$TMPDIR/scriptTMP"
-echoRgb "你要備份跑路？祝你卡米9008" "2"
-#計算出備份大小跟差異性
-filesizee="$(du -ks "$Backup" | awk '{print $1}')"
-dsize="$(($((filesizee - filesize)) / 1024))"
-echoRgb "備份資料夾路徑:$Backup" "2"
-echoRgb "備份資料夾總體大小$(du -ksh "$Backup" | awk '{print $1}')"
-if [[ $dsize -gt 0 ]]; then
+	done
+	rm -rf "$TMPDIR/scriptTMP"
+	echoRgb "你要備份跑路？祝你卡米9008" "2"
+	#計算出備份大小跟差異性
+	filesizee="$(du -ks "$Backup" | awk '{print $1}')"
+	dsize="$(($((filesizee - filesize)) / 1024))"
+	echoRgb "備份資料夾路徑:$Backup" "2"
+	echoRgb "備份資料夾總體大小$(du -ksh "$Backup" | awk '{print $1}')"
+	if [[ $dsize -gt 0 ]]; then
 		if [[ $((dsize / 1024)) -gt 0 ]]; then
 			echoRgb "本次備份: $((dsize / 1024))gb"
 		else
 			echoRgb "本次備份: ${dsize}mb"
 		fi
-else
+	else
 		echoRgb "本次備份: $(($((filesizee - filesize)) * 1000 / 1024))kb"
-fi
-echoRgb "批量備份完成"
-starttime1="$TIME"
-endtime 1 "批量備份開始到結束"
-longToast "批量備份完成"
-Print "批量備份完成 執行過程請查看$Status_log"
-exit 0
+	fi
+	echoRgb "批量備份完成"
+	starttime1="$TIME"
+	endtime 1 "批量備份開始到結束"
+	longToast "批量備份完成"
+	Print "批量備份完成 執行過程請查看$Status_log"
+	exit 0
 }
--- a/tools/bin/bin.sh
+++ b/tools/bin/bin.sh
@@ -18,15 +18,16 @@ if [[ -d $(magisk --path 2>/dev/null) ]]; then
 	PATH="$(magisk --path)/.magisk/busybox:$PATH"
 else
 	echo "Magisk busybox Path does not exist"
-fi ; export PATH="$PATH"
-backup_version="V13.4"
+fi
+export PATH="$PATH"
+backup_version="V13.4fix"
 #設置二進制命令目錄位置
-[[ $bin_path = "" ]] && echo "未正確指定bin.sh位置" && exit 2
+[[ $bin_path == "" ]] && echo "未正確指定bin.sh位置" && exit 2
 #bin_path="${bin_path/'/storage/emulated/'/'/data/media/'}"
 Status_log="$MODDIR/Log.txt"
 rm -rf "$Status_log"
 filepath="/data/backup_tools"
-if [[ $APP_ENV = 1 ]]; then
+if [[ $APP_ENV == 1 ]]; then
 	filepath="/data/user/0/com.xayah.databackup/backup_tools"
 fi
 busybox="$filepath/busybox"
@@ -39,12 +40,12 @@ update
 bin.sh"
 if [[ ! -d $filepath ]]; then
 	mkdir -p "$filepath"
-	[[ $? = 0 ]] && echo "設置busybox環境中"
+	[[ $? == 0 ]] && echo "設置busybox環境中"
 fi
 [[ ! -f $bin_path/busybox_path ]] && touch "$bin_path/busybox_path"
 if [[ $filepath != $(cat "$bin_path/busybox_path") ]]; then
 	[[ -d $(cat "$bin_path/busybox_path") ]] && rm -rf "$(cat "$bin_path/busybox_path")"
-	echo "$filepath">"$bin_path/busybox_path"
+	echo "$filepath" >"$bin_path/busybox_path"
 fi
 #刪除無效軟連結
 find -L "$filepath" -maxdepth 1 -type l -exec rm -rf {} \;
@@ -89,7 +90,7 @@ export PATH="$filepath:$PATH"
 export TZ=Asia/Taipei
 TMPDIR="/data/local/tmp"
 [[ ! -d $TMPDIR ]] && mkdir "$TMPDIR"
-if [[ $(which busybox) = "" ]]; then
+if [[ $(which busybox) == "" ]]; then
 	echo "環境變量中沒有找到busybox 請在tools/bin內添加一個\narm64可用的busybox\n或是安裝搞機助手 scene或是Magisk busybox模塊...."
 	exit 1
 fi
@@ -113,18 +114,18 @@ Print() {
 }
 echoRgb() {
 	#轉換echo顏色提高可讀性
-	if [[ $2 = 0 ]]; then
+	if [[ $2 == 0 ]]; then
 		echo -e "\e[38;5;196m -$1\e[0m"
-	elif [[ $2 = 1 ]]; then
+	elif [[ $2 == 1 ]]; then
 		echo -e "\e[38;5;82m -$1\e[0m"
-	elif [[ $2 = 2 ]]; then
+	elif [[ $2 == 2 ]]; then
 		echo -e "\e[38;5;87m -$1\e[0m"
-	elif [[ $2 = 3 ]]; then
+	elif [[ $2 == 3 ]]; then
 		echo -e "\e[38;5;${en}m -$1\e[0m"
 	else
 		echo -e "\e[38;5;${bn}m -$1\e[0m"
 	fi
-	echo " -$(date '+%T') $1">>"$Status_log"
+	echo " -$(date '+%T') $1" >>"$Status_log"
 }
 get_version() {
 	while :; do
@@ -148,19 +149,22 @@ get_version() {
 }
 isBoolean() {
 	nsx="$1"
-	if [[ $1 = 1 ]];then
+	if [[ $1 == 1 ]]; then
 		nsx=true
-	elif [[ $1 = 0 ]];then
+	elif [[ $1 == 0 ]]; then
 		nsx=false
 	else
 		echoRgb "$MODDIR/backup_settings.conf $1填寫錯誤" "0" && exit 2
 	fi
 }
 echo_log() {
-	if [[ $? = 0 ]]; then
-		echoRgb "$1成功" "1" ; result=0
+	if [[ $? == 0 ]]; then
+		echoRgb "$1成功" "1"
+		result=0
 	else
-		echoRgb "$1失敗，過世了" "0" ; Print "$1失敗，過世了" ; result=1
+		echoRgb "$1失敗，過世了" "0"
+		Print "$1失敗，過世了"
+		result=1
 	fi
 }
 Open_apps="$(appinfo -d "(" -ed ")" -o ands,pn -ta c)"
@@ -182,10 +186,10 @@ if [[ $script != "" ]]; then
 		done
 	fi
 fi
-if [[ $(pm path ice.message) = "" ]]; then
+if [[ $(pm path ice.message) == "" ]]; then
 	echoRgb "未安裝toast 開始安裝" "0"
 	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"
+	[[ $? == 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'
@@ -196,13 +200,16 @@ if [[ -e $bin_path/update ]]; then
 	Language="https://api.github.com/repos/Petit-Abba/backup_script_zh-CN/releases/latest"
 	if [[ $LANG != "" ]]; then
 		case $LANG in
-		*-TW|*-tw)
+		*-TW | *-tw)
 			echoRgb "系統語系:繁體中文"
-			Language="https://api.github.com/repos/YAWAsau/backup_script/releases/latest" ;;
-		*-CN|*-cn)
-			echoRgb "系統語系:簡體中文" ;;
-		* )
-			echoRgb "$LANG不支持 默認簡體中文" "0" ;;
+			Language="https://api.github.com/repos/YAWAsau/backup_script/releases/latest"
+			;;
+		*-CN | *-cn)
+			echoRgb "系統語系:簡體中文"
+			;;
+		*)
+			echoRgb "$LANG不支持 默認簡體中文" "0"
+			;;
 		esac
 	else
 		echoRgb "獲取系統語系失敗 默認簡體中文" "0"
@@ -227,7 +234,7 @@ if [[ -e $bin_path/update ]]; then
 			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
+			if [[ $result == 0 ]]; then
 				echoRgb "update $backup_version > $tag"
 				zippath="$(find "$MODDIR" -maxdepth 1 -name "*.zip" -type f)"
 				GitHub="true"
@@ -247,14 +254,14 @@ if [[ $zippath != "" ]]; then
 	case $(echo "$zippath" | wc -l) in
 	1)
 		[[ $GitHub != true ]] && echoRgb "從$zippath更新"
-		if [[ $(unzip -l "$zippath" | awk '{print $4}' | grep -oE "^backup_settings.conf$") = "" ]]; then
+		if [[ $(unzip -l "$zippath" | awk '{print $4}' | grep -oE "^backup_settings.conf$") == "" ]]; then
 			echoRgb "${zippath##*/}並非指定的備份zip，請刪除後重新放置\n -何謂更新zip? 就是GitHub release頁面下載的zip" "0"
 		else
 			cp -r "$tools_path" "$TMPDIR" && rm -rf "$tools_path"
 			find "$MODDIR" -maxdepth 3 -name "*.sh" -type f -exec rm -rf {} \;
 			unzip -o "$zippath" -d "$MODDIR"
 			echo_log "解壓縮${zippath##*/}"
-			if [[ $result = 0 ]]; then
+			if [[ $result == 0 ]]; then
 				case $MODDIR in
 				*Backup_*)
 					if [[ -f $MODDIR/app_details ]]; then
@@ -296,7 +303,8 @@ if [[ $zippath != "" ]]; then
 							cp -r "$tools_path" "${MODDIR%/*}"
 						fi
 					fi
-					rm -rf "$tools_path/script" "$MODDIR/backup_settings.conf" "$MODDIR/backup.sh" "$MODDIR/Getlist.sh" ;;
+					rm -rf "$tools_path/script" "$MODDIR/backup_settings.conf" "$MODDIR/backup.sh" "$MODDIR/Getlist.sh"
+					;;
 				*)
 					if [[ $(find "$MODDIR" -maxdepth 1 -name "Backup_*" -type d) != "" ]]; then
 						find "$MODDIR" -maxdepth 1 -name "Backup_*" -type d | while read backup_path; do
@@ -318,7 +326,8 @@ if [[ $zippath != "" ]]; then
 						done
 					else
 						echoRgb "更新當前${MODDIR##*/}目錄下備份相關腳本+tools目錄"
-					fi ;;
+					fi
+					;;
 				esac
 			else
 				cp -r "$TMPDIR/tools" "$MODDIR"
@@ -326,9 +335,11 @@ if [[ $zippath != "" ]]; then
 			rm -rf "$TMPDIR"/*
 			find "$MODDIR" -maxdepth 1 -name "*.zip" -type f -exec rm -rf {} \;
 			echoRgb "更新完成 請重新執行腳本" "2" && exit
-		fi ;;
+		fi
+		;;
 	*)
-		echoRgb "錯誤 請刪除當前目錄多餘zip\n -保留一個最新的數據備份.zip\n -下列為當前目錄zip\n$zippath" "0" && exit 1 ;;
+		echoRgb "錯誤 請刪除當前目錄多餘zip\n -保留一個最新的數據備份.zip\n -下列為當前目錄zip\n$zippath" "0" && exit 1
+		;;
 	esac
 fi
 #down -s -L "https://magisk-modules-repo.github.io/submission/modules.json" | jq -r '.modules[] | {id,prop_url,zip_url}'
--- a/tools/bin/busybox_path
+++ b/tools/bin/busybox_path
@@ -1 +0,0 @@
-/data/user/0/com.xayah.databackup/backup_tools
--- a/tools/script/recover.conf
+++ b/tools/script/recover.conf
@@ -1,2 +0,0 @@
-#恢復模式 1恢復Apk+數據 0恢復apk不恢復數據
-Recovery_mode=1
--- a/tools/script/restore
+++ b/tools/script/restore
@@ -5,11 +5,7 @@ bin_path="$MODDIR/tools/bin"
 script="${0##*/}"
 [[ ! -d $tools_path ]] && echo "$tools_path目錄遺失" && exit 1
 [[ ! -d $bin_path ]] && echo "$bin_path目錄遺失" && exit 1
-[[ ! -f $MODDIR/recover.conf ]] && echo "recover.conf遺失" && exit 1
 . "$bin_path/bin.sh"
-. "$MODDIR/recover.conf"
-isBoolean "$Recovery_mode" && Recovery_mode="$nsx"
-[[ $Recovery_mode = false ]] && echoRgb "當前恢復模式:安裝apk不恢復數據" "0" || echoRgb "當前恢復模式:安裝apk+恢復數據" "1"
 path="/data/media/0/Android"
 path2="/data/data"
 [[ ! -d $path2 ]] && echoRgb "設備不存在user目錄" "0" && exit 1
@@ -18,8 +14,8 @@ i=1
 txt="$MODDIR/appList.txt"
 [[ ! -f $txt ]] && echoRgb "請執行\"DumpName.sh\"獲取應用列表再來恢復" "0" && exit 2
 r="$(cat "$txt" | grep -v "#" | sed -e '/^$/d' | sed -n '$=')"
-[[ $r = "" ]] && echoRgb "appList.txt包名為空或是被注釋了" "0" && exit 1
-[[ $(which restorecon) = "" ]] && echoRgb "restorecon命令不存在" "0" && exit 1
+[[ $r == "" ]] && echoRgb "appList.txt包名為空或是被注釋了" "0" && exit 1
+[[ $(which restorecon) == "" ]] && echoRgb "restorecon命令不存在" "0" && exit 1
 #顯示執行結果
 Release_data() {
 	tar_path="$1"
@@ -31,35 +27,45 @@ Release_data() {
 	user)
 		if [[ -d $X ]]; then
 			case ${FILE_NAME##*.} in
-			lz4) pv "$tar_path" | tar --recursive-unlink -I lz4 -xmpf - -C "$path2" ;;
-			zst) pv "$tar_path" | tar --recursive-unlink -I zstd -xmpf - -C "$path2" ;;
-			tar) pv "$tar_path" | tar --recursive-unlink -xmpf - -C "$path2" ;;
-			*) echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0" ; Set_back
+			lz4) pv -f -f "$tar_path" | tar --recursive-unlink -I lz4 -xmpf - -C "$path2" ;;
+			zst) pv -f -f "$tar_path" | tar --recursive-unlink -I zstd -xmpf - -C "$path2" ;;
+			tar) pv -f -f "$tar_path" | tar --recursive-unlink -xmpf - -C "$path2" ;;
+			*)
+				echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
+				Set_back
+				;;
 			esac
 		else
-			echoRgb "$X不存在 無法恢復$FILE_NAME2數據" "0" ; Set_back
+			echoRgb "$X不存在 無法恢復$FILE_NAME2數據" "0"
+			Set_back
 		fi
 		;;
-	data|obb)
+	data | obb)
 		case ${FILE_NAME##*.} in
-		lz4) pv "$tar_path" | tar --recursive-unlink -I lz4 -xmPpf - ;;
-		zst) pv "$tar_path" | tar --recursive-unlink -I zstd -xmPpf - ;;
-		tar) pv "$tar_path" | tar --recursive-unlink -xmPpf - ;;
-		*) echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0" ; Set_back
+		lz4) pv -f -f "$tar_path" | tar --recursive-unlink -I lz4 -xmPpf - ;;
+		zst) pv -f -f "$tar_path" | tar --recursive-unlink -I zstd -xmPpf - ;;
+		tar) pv -f -f "$tar_path" | tar --recursive-unlink -xmPpf - ;;
+		*)
+			echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
+			Set_back
+			;;
 		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 - ;;
-		tar) pv "$tar_path" | tar -xPpf - ;;
-		*) echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0" ; Set_back
+		lz4) pv -f -f "$tar_path" | tar -I lz4 -xPpf - ;;
+		zst) pv -f -f "$tar_path" | tar -I zstd -xPpf - ;;
+		tar) pv -f -f "$tar_path" | tar -xPpf - ;;
+		*)
+			echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
+			Set_back
+			;;
 		esac
 		;;
 	esac
 	echo_log "$FILE_NAME 解壓縮($FILE_NAME2)"
-	if [[ $result = 0 ]]; then
+	if [[ $result == 0 ]]; then
 		if [[ $A != "" ]]; then
 			app_details="$Backup_folder2/app_details"
 			[[ -f $app_details ]] && echoRgb "解壓路徑:$(cat "$app_details" | awk "/${FILE_NAME2}path/"'{print $1}' | cut -f2 -d '=' | tail -n1 | sed 's/\"//g')" || echoRgb "已經成功解壓縮 但是解壓路徑獲取失敗" "0"
@@ -72,7 +78,8 @@ Release_data() {
 					G="$(cat "/config/sdcardfs/$name2/appid")"
 				else
 					G="$(dumpsys package "$name2" | awk '/userId=/{print $1}' | cut -f2 -d '=' | head -1)"
-				fi ; G="$(echo "$G" | grep -Eo '[0-9]+')"
+				fi
+				G="$(echo "$G" | grep -Eo '[0-9]+')"
 				if [[ $G != "" ]]; then
 					echoRgb "路徑:$X"
 					Path_details="$(stat -c "%A/%a %U/%G" "$X")"
@@ -85,12 +92,15 @@ Release_data() {
 				fi
 			else
 				echoRgb "路徑$X不存在" "0"
-			fi ;;
-		data|obb)
-			[[ -d $path/$FILE_NAME2/$name2 ]] && chmod -R 0777 "$path/$FILE_NAME2/$name2" ;;
+			fi
+			;;
+		data | obb)
+			[[ -d $path/$FILE_NAME2/$name2 ]] && chmod -R 0777 "$path/$FILE_NAME2/$name2"
+			;;
 		thanox)
 			restorecon -RF "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)/" >/dev/null 2>&1
-			echo_log "selinux上下文設置" && echoRgb "警告 thanox配置恢復後務必重啟\n -否則不生效" "0" ;;
+			echo_log "selinux上下文設置" && echoRgb "警告 thanox配置恢復後務必重啟\n -否則不生效" "0"
+			;;
 		esac
 	fi
 }
@@ -101,10 +111,10 @@ TIME="$starttime1"
 [[ $(pm path "com.android.vending") != "" ]] && echoRgb "注意 為了避免還原失敗請關閉PLAY的安全檢查"
 en=118
 {
-while [[ $i -le $r ]]; do
+	while [[ $i -le $r ]]; do
 		[[ $en -ge 229 ]] && en=118
 		if [[ ! -f $MODDIR/apktmp ]]; then
-		echoRgb "恢複第$i/$r個應用 剩下$((r-i))個"
+			echoRgb "恢複第$i/$r個應用 剩下$((r - i))個"
 			name1="$(cat "$txt" | grep -v "#" | sed -e '/^$/d' | sed -n "${i}p" | awk '{print $1}')"
 			name2="$(cat "$txt" | grep -v "#" | sed -e '/^$/d' | sed -n "${i}p" | awk '{print $2}')"
 		else
@@ -112,27 +122,36 @@ while [[ $i -le $r ]]; do
 			name1="$(cat "$MODDIR/apktmp" | grep -v "#" | sed -e '/^$/d' | sed -n "${i}p" | awk '{print $1}')"
 			name2="$(cat "$MODDIR/apktmp" | grep -v "#" | sed -e '/^$/d' | sed -n "${i}p" | awk '{print $2}')"
 		fi
+		unset No_backupdata
+		if [[ $name1 == *! || $name1 == *！ ]]; then
+			name1="$(echo "$name1" | sed 's/!//g ; s/！//g')"
+			echoRgb "跳過恢復$name1 所有數據" "0"
+			No_backupdata=1
+		fi
 		Backup_folder="$MODDIR/$name1"
 		Backup_folder2="$MODDIR/媒體"
-	[[ $name2 = "" ]] && echoRgb "應用包名獲取失敗" "0" && exit 1
+		[[ $name2 == "" ]] && echoRgb "應用包名獲取失敗" "0" && exit 1
 		if [[ -d $Backup_folder ]]; then
-		echoRgb "恢複$name1 ($name2)" && echo "$name1 $name2">"$MODDIR/apktmp"
+			echoRgb "恢複$name1 ($name2)" && echo "$name1 $name2" >"$MODDIR/apktmp"
 			starttime2="$(date -u "+%s")"
-		if [[ $(pm path "$name2") = "" ]]; then
+			if [[ $(pm path "$name2") == "" ]]; then
 				apkfile="$(find "$Backup_folder" -maxdepth 1 -name "apk.*" -type f 2>/dev/null)"
 				if [[ $apkfile != "" ]]; then
 					rm -rf "$TMPDIR"/*
 					case ${apkfile##*.} in
-				lz4) pv "$apkfile" | tar -I lz4 -xmpf - -C "$TMPDIR" ;;
-				zst) pv "$apkfile" | tar -I zstd -xmpf - -C "$TMPDIR"  ;;
-				tar) pv "$apkfile" | tar -xmpf - -C "$TMPDIR" ;;
-				*) echoRgb "${apkfile##*/} 壓縮包不支持解壓縮" "0" ; Set_back
+					lz4) pv -f -f "$apkfile" | tar -I lz4 -xmpf - -C "$TMPDIR" ;;
+					zst) pv -f -f "$apkfile" | tar -I zstd -xmpf - -C "$TMPDIR" ;;
+					tar) pv -f -f "$apkfile" | tar -xmpf - -C "$TMPDIR" ;;
+					*)
+						echoRgb "${apkfile##*/} 壓縮包不支持解壓縮" "0"
+						Set_back
+						;;
 					esac
 					echo_log "${apkfile##*/}解壓縮" && [[ -f $Backup_folder/nmsl.apk ]] && cp -r "$Backup_folder/nmsl.apk" "$TMPDIR"
 				else
 					echoRgb "你的Apk壓縮包離家出走了，可能備份後移動過程遺失了\n -解決辦法手動安裝Apk後再執行恢復腳本" "0"
 				fi
-			if [[ $result = 0 ]]; then
+				if [[ $result == 0 ]]; then
 					case $(find "$TMPDIR" -maxdepth 1 -name "*.apk" -type f 2>/dev/null | wc -l) in
 					1)
 						echoRgb "恢復普通apk"
@@ -161,7 +180,7 @@ while [[ $i -le $r ]]; do
 			else
 				echoRgb "存在當前系統中略過安裝Apk"
 			fi
-		if [[ $Recovery_mode = true ]]; then
+			if [[ $No_backupdata == "" ]]; then
 				if [[ $(pm path "$name2") != "" ]]; then
 					#停止應用
 					[[ $name2 != $Open_apps2 ]] && am force-stop "$name2"
@@ -173,34 +192,35 @@ while [[ $i -le $r ]]; do
 				fi
 			fi
 			rm -rf "$MODDIR/apktmp"
-		endtime 2 "$name1恢複" && echoRgb "完成$((i*100/r))%" && echoRgb "____________________________________" "3"
+			endtime 2 "$name1恢複" && echoRgb "完成$((i * 100 / r))%" && echoRgb "____________________________________" "3"
 		else
 			echoRgb "$Backup_folder資料夾遺失，無法恢複" "0"
 		fi
-	if [[ $i = $r ]]; then
+		if [[ $i == $r ]]; then
 			endtime 1 "應用恢復"
 			if [[ -d $Backup_folder2 ]]; then
-			Print "是否恢復多媒體數據 音量上恢復，音量下不恢復" ; echoRgb "是否恢復多媒體數據\n -音量上恢復，音量下不恢復"
+				Print "是否恢復多媒體數據 音量上恢復，音量下不恢復"
+				echoRgb "是否恢復多媒體數據\n -音量上恢復，音量下不恢復"
 				get_version "恢復媒體數據" "跳過恢復媒體數據"
 				starttime1="$(date -u "+%s")"
 				A=1
 				B="$(find "$Backup_folder2" -maxdepth 1 -name "*.tar*" -type f | wc -l)"
-			if [[ $branch = true ]]; then
+				if [[ $branch == true ]]; then
 					find "$Backup_folder2" -maxdepth 1 -name "*.tar*" -type f | while read; do
 						starttime2="$(date -u "+%s")"
-					echoRgb "恢復第$A/$B個壓縮包 剩下$((B-A))個"
+						echoRgb "恢復第$A/$B個壓縮包 剩下$((B - A))個"
 						Release_data "$REPLY"
-					endtime 2 "$FILE_NAME2恢複" && echoRgb "完成$((A*100/B))%" && echoRgb "____________________________________" "3" && let A++
+						endtime 2 "$FILE_NAME2恢複" && echoRgb "完成$((A * 100 / B))%" && echoRgb "____________________________________" "3" && let A++
 					done
 					endtime 1 "自定義恢復"
 				fi
 			fi
 		fi
 		let i++ en++ nskg++
-done
-rm -rf "$TMPDIR/scriptTMP"
-starttime1="$TIME"
-echoRgb "批量恢複完成" && endtime 1 "批量恢複開始到結束" && echoRgb "如發現應用閃退請重新開機"
-longToast "批量恢復完成"
-Print "批量恢復完成 執行過程請查看$Status_log" && rm -rf "$TMPDIR"/*
-} &
+	done
+	rm -rf "$TMPDIR/scriptTMP"
+	starttime1="$TIME"
+	echoRgb "批量恢複完成" && endtime 1 "批量恢複開始到結束" && echoRgb "如發現應用閃退請重新開機"
+	longToast "批量恢復完成"
+	Print "批量恢復完成 執行過程請查看$Status_log" && rm -rf "$TMPDIR"/*
+}
--- a/tools/script/restore2
+++ b/tools/script/restore2
@@ -5,30 +5,28 @@ bin_path="${MODDIR%/*}/tools/bin"
 script="${0##*/}"
 [[ ! -d $tools_path ]] && echo "$tools_path目錄遺失" && exit 1
 [[ ! -d $bin_path ]] && echo "$bin_path目錄遺失" && exit 1
-[[ ! -f $MODDIR/recover.conf ]] && echo "recover.conf遺失" && exit 1
-. "$MODDIR/recover.conf"
 . "$bin_path/bin.sh"
-isBoolean "$Recovery_mode" && Recovery_mode="$nsx"
-[[ $Recovery_mode = false ]] && echoRgb "當前恢復模式:安裝apk不恢復數據" "0" || echoRgb "當前恢復模式:安裝apk+恢復數據" "1"
 path="/data/media/0/Android"
 path2="/data/data"
 [[ ! -d $path2 ]] && echoRgb "設備不存在user目錄" "0" && exit 1
-[[ $(which restorecon) = "" ]] && echoRgb "restorecon命令不存在" "0" && exit 1
+[[ $(which restorecon) == "" ]] && echoRgb "restorecon命令不存在" "0" && exit 1
 #記錄開始時間
 starttime1="$(date -u "+%s")"
 [[ $(pm path "com.android.vending") != "" ]] && echoRgb "注意 為了避免還原失敗請關閉PLAY的安全檢查"
 {
-Backup_folder="$MODDIR"
-if [[ ! -f $Backup_folder/app_details ]]; then
+	Backup_folder="$MODDIR"
+	if [[ ! -f $Backup_folder/app_details ]]; then
 		echoRgb "$Backup_folder/app_details遺失，無法獲取包名" "0" && exit 1
-else
+	else
 		. "$Backup_folder/app_details"
-fi
-name="$PackageName" ; [[ $name = "" ]] && echoRgb "包名獲取失敗" "0" && exit 2
-name2="$ChineseName" ; [[ $name2 = "" ]] && echoRgb "應用名獲取失敗" "0" && exit 2
-echoRgb "恢複$name2 ($name)"
-starttime2="$(date -u "+%s")"
-if [[ $(pm path "$name") = "" ]]; then
+	fi
+	name="$PackageName"
+	[[ $name == "" ]] && echoRgb "包名獲取失敗" "0" && exit 2
+	name2="$ChineseName"
+	[[ $name2 == "" ]] && echoRgb "應用名獲取失敗" "0" && exit 2
+	echoRgb "恢複$name2 ($name)"
+	starttime2="$(date -u "+%s")"
+	if [[ $(pm path "$name") == "" ]]; then
 		apkfile="$(find "$Backup_folder" -maxdepth 1 -name "apk.*" -type f 2>/dev/null)"
 		if [[ $apkfile != "" ]]; then
 			rm -rf "$TMPDIR"/*
@@ -36,13 +34,16 @@ if [[ $(pm path "$name") = "" ]]; then
 			lz4) pv "$apkfile" | tar -I lz4 -xmpf - -C "$TMPDIR" ;;
 			zst) pv "$apkfile" | tar -I zstd -xmpf - -C "$TMPDIR" ;;
 			tar) pv "$apkfile" | tar -xmpf - -C "$TMPDIR" ;;
-		*) echoRgb "${apkfile##*/} 壓縮包不支持解壓縮" "0" ; Set_back
+			*)
+				echoRgb "${apkfile##*/} 壓縮包不支持解壓縮" "0"
+				Set_back
+				;;
 			esac
 			echo_log "${apkfile##*/}解壓縮" && [[ -f $Backup_folder/nmsl.apk ]] && cp -r "$Backup_folder/nmsl.apk" "$TMPDIR"
 		else
 			echoRgb "你的Apk壓縮包離家出走了，可能備份後移動過程遺失了\n -解決辦法手動安裝Apk後再執行恢復腳本" "0"
 		fi
-	if [[ $result = 0 ]]; then
+		if [[ $result == 0 ]]; then
 			case $(find "$TMPDIR" -maxdepth 1 -name "*.apk" -type f 2>/dev/null | wc -l) in
 			1)
 				echoRgb "恢復普通apk"
@@ -68,10 +69,9 @@ if [[ $(pm path "$name") = "" ]]; then
 				;;
 			esac
 		fi
-else
+	else
 		echoRgb "存在當前系統中略過安裝Apk"
-fi
-if [[ $Recovery_mode = true ]]; then
+	fi
 	if [[ $(pm path "$name") != "" ]]; then
 		#停止應用
 		[[ $name != $Open_apps2 ]] && am force-stop "$name"
@@ -81,28 +81,35 @@ if [[ $Recovery_mode = true ]]; then
 			FILE_NAME="${tar_path##*/}"
 			FILE_NAME2="${FILE_NAME%%.*}"
 			echoRgb "恢復$FILE_NAME2數據" "2"
-			if [[ $FILE_NAME2 = user ]]; then
+			if [[ $FILE_NAME2 == user ]]; then
 				if [[ -d $X ]]; then
 					case ${FILE_NAME##*.} in
 					lz4) pv "$tar_path" | tar --recursive-unlink -I lz4 -xmpf - -C "$path2" ;;
 					zst) pv "$tar_path" | tar --recursive-unlink -I zstd -xmpf - -C "$path2" ;;
 					tar) pv "$tar_path" | tar --recursive-unlink -xmpf - -C "$path2" ;;
-					*) echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0" ; Set_back
+					*)
+						echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
+						Set_back
+						;;
 					esac
 				else
-					echoRgb "$X不存在 無法恢復$FILE_NAME2數據" "0" ; Set_back
+					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 - ;;
 				tar) pv "$tar_path" | tar --recursive-unlink -xmPpf - ;;
-				*) echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0" ; Set_back
+				*)
+					echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
+					Set_back
+					;;
 				esac
 			fi
 			echo_log "$FILE_NAME 解壓縮($FILE_NAME2)"
-			if [[ $result = 0 ]]; then
+			if [[ $result == 0 ]]; then
 				case $FILE_NAME2 in
 				user)
 					if [[ -d $X ]]; then
@@ -110,7 +117,8 @@ if [[ $Recovery_mode = true ]]; then
 							G="$(cat "/config/sdcardfs/$name/appid")"
 						else
 							G="$(dumpsys package "$name" | awk '/userId=/{print $1}' | cut -f2 -d '=' | head -1)"
-						fi ; G="$(echo "$G" | grep -Eo '[0-9]+')"
+						fi
+						G="$(echo "$G" | grep -Eo '[0-9]+')"
 						if [[ $G != "" ]]; then
 							echoRgb "路徑:$X"
 							Path_details="$(stat -c "%A/%a %U/%G" "$X")"
@@ -123,19 +131,21 @@ if [[ $Recovery_mode = true ]]; then
 						fi
 					else
 						echoRgb "路徑$X不存在" "0"
-					fi ;;
-				data|obb)
-					[[ -d $path/$FILE_NAME2/$name2 ]] && chmod -R 0777 "$path/$FILE_NAME2/$name2" ;;
+					fi
+					;;
+				data | obb)
+					[[ -d $path/$FILE_NAME2/$name2 ]] && chmod -R 0777 "$path/$FILE_NAME2/$name2"
+					;;
 				thanox)
 					restorecon -RF "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)/" >/dev/null 2>&1
-					echo_log "selinux上下文設置" && echoRgb "警告 thanox配置恢復後務必重啟\n -否則不生效" "0" ;;
+					echo_log "selinux上下文設置" && echoRgb "警告 thanox配置恢復後務必重啟\n -否則不生效" "0"
+					;;
 				esac
 			fi
 		done
 	else
 		echoRgb "$name2沒有安裝無法恢復數據" "0"
 	fi
-fi
-endtime 1 "恢複開始到結束" && echoRgb "如發現應用閃退請重新開機" && rm -rf "$TMPDIR"/*
-rm -rf "$TMPDIR/scriptTMP"
+	endtime 1 "恢複開始到結束" && echoRgb "如發現應用閃退請重新開機" && rm -rf "$TMPDIR"/*
+	rm -rf "$TMPDIR/scriptTMP"
 } &
				`@@ -1 +0,0 @@`
				`/data/user/0/com.xayah.databackup/backup_tools`