bug fix

2022-01-01 14:47:43 +08:00
parent 55f549d047
commit 548fc19822
6 changed files with 447 additions and 395 deletions
--- a/tools/bin/bin.sh
+++ b/tools/bin/bin.sh
@@ -1,7 +1,7 @@
 test "$(whoami)" != root && echo "你是憨批？不給Root用你媽 爬" && exit 1
 abi="$(getprop ro.product.cpu.abi)"
 case $abi in
-arm64*) 
+arm64*)
 	[[ $(getprop ro.build.version.sdk) -lt 28 ]] && echo "設備Android $(getprop ro.build.version.release)版本過低 請升級至Android 9+" && exit 1
 	;;
 *)
@@ -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,23 +149,26 @@ 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)"
-Open_apps2="$(echo "$Open_apps" | cut -f2 -d '(' | sed 's/)//g')" 
+Open_apps2="$(echo "$Open_apps" | cut -f2 -d '(' | sed 's/)//g')"
 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"
 bn=195
@@ -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"
+	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'
@@ -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,12 +335,14 @@ 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}'
 #down -s -L "https://magisk-modules-repo.github.io/submission/modules.json" | jq -r '.modules[].zip_url' | egrep -w "Ainur_Narsil|riru_lsposed|busybox-ndk|riru_storage_redirect|riru-core|HideNavBar|ccbins" | while read; do
 #	down -s -L -o "$MODDIR/${REPLY##*/}" "$REPLY"
-#done
+#done
--- 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,106 +111,116 @@ TIME="$starttime1"
 [[ $(pm path "com.android.vending") != "" ]] && echoRgb "注意 為了避免還原失敗請關閉PLAY的安全檢查"
 en=118
 {
-while [[ $i -le $r ]]; do
-	[[ $en -ge 229 ]] && en=118
-	if [[ ! -f $MODDIR/apktmp ]]; then
-		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
-		echoRgb "由於上次意外中斷恢復，本次恢復上次恢復應用" && r=1
-		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
-	Backup_folder="$MODDIR/$name1"
-	Backup_folder2="$MODDIR/媒體"
-	[[ $name2 = "" ]] && echoRgb "應用包名獲取失敗" "0" && exit 1
-	if [[ -d $Backup_folder ]]; then
-		echoRgb "恢複$name1 ($name2)" && echo "$name1 $name2">"$MODDIR/apktmp"
-		starttime2="$(date -u "+%s")"
-		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
-				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
-				case $(find "$TMPDIR" -maxdepth 1 -name "*.apk" -type f 2>/dev/null | wc -l) in
-				1)
-					echoRgb "恢復普通apk"
-					pm install -i com.android.vending --user 0 -r "$TMPDIR"/*.apk >/dev/null 2>&1
-					echo_log "Apk安裝"
-					;;
-				0)
-					echoRgb "$TMPDIR中沒有apk" "0"
-					;;
-				*)
-					echoRgb "恢復split apk"
-					b="$(pm install-create -i -i com.android.vending --user 0 | grep -E -o '[0-9]+')"
-					if [[ -f $TMPDIR/nmsl.apk ]]; then
-						pm install -i com.android.vending --user 0 -r "$TMPDIR/nmsl.apk" >/dev/null 2>&1
-						echo_log "nmsl.apk安裝"
-					fi
-					find "$TMPDIR" -maxdepth 1 -name "*.apk" -type f | grep -v 'nmsl.apk' |  while read; do
-						pm install-write "$b" "${REPLY##*/}" "$REPLY" >/dev/null 2>&1
-						echo_log "${REPLY##*/}安裝"
-					done
-					pm install-commit "$b" >/dev/null 2>&1
-					echo_log "split Apk安裝"
-					;;
-				esac
-			fi
+	while [[ $i -le $r ]]; do
+		[[ $en -ge 229 ]] && en=118
+		if [[ ! -f $MODDIR/apktmp ]]; then
+			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
-			echoRgb "存在當前系統中略過安裝Apk"
+			echoRgb "由於上次意外中斷恢復，本次恢復上次恢復應用" && r=1
+			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
-		if [[ $Recovery_mode = true ]]; then
-			if [[ $(pm path "$name2") != "" ]]; then
-				#停止應用
-				[[ $name2 != $Open_apps2 ]] && am force-stop "$name2"
-				find "$Backup_folder" -maxdepth 1 ! -name "apk.*" -name "*.tar*" -type f | sort | while read; do
-					Release_data "$REPLY"
-				done
+		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
+		if [[ -d $Backup_folder ]]; then
+			echoRgb "恢複$name1 ($name2)" && echo "$name1 $name2" >"$MODDIR/apktmp"
+			starttime2="$(date -u "+%s")"
+			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 -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
+					case $(find "$TMPDIR" -maxdepth 1 -name "*.apk" -type f 2>/dev/null | wc -l) in
+					1)
+						echoRgb "恢復普通apk"
+						pm install -i com.android.vending --user 0 -r "$TMPDIR"/*.apk >/dev/null 2>&1
+						echo_log "Apk安裝"
+						;;
+					0)
+						echoRgb "$TMPDIR中沒有apk" "0"
+						;;
+					*)
+						echoRgb "恢復split apk"
+						b="$(pm install-create -i -i com.android.vending --user 0 | grep -E -o '[0-9]+')"
+						if [[ -f $TMPDIR/nmsl.apk ]]; then
+							pm install -i com.android.vending --user 0 -r "$TMPDIR/nmsl.apk" >/dev/null 2>&1
+							echo_log "nmsl.apk安裝"
+						fi
+						find "$TMPDIR" -maxdepth 1 -name "*.apk" -type f | grep -v 'nmsl.apk' | while read; do
+							pm install-write "$b" "${REPLY##*/}" "$REPLY" >/dev/null 2>&1
+							echo_log "${REPLY##*/}安裝"
+						done
+						pm install-commit "$b" >/dev/null 2>&1
+						echo_log "split Apk安裝"
+						;;
+					esac
+				fi
 			else
-				echoRgb "$name1沒有安裝無法恢復數據" "0"
+				echoRgb "存在當前系統中略過安裝Apk"
+			fi
+			if [[ $No_backupdata == "" ]]; then
+				if [[ $(pm path "$name2") != "" ]]; then
+					#停止應用
+					[[ $name2 != $Open_apps2 ]] && am force-stop "$name2"
+					find "$Backup_folder" -maxdepth 1 ! -name "apk.*" -name "*.tar*" -type f | sort | while read; do
+						Release_data "$REPLY"
+					done
+				else
+					echoRgb "$name1沒有安裝無法恢復數據" "0"
+				fi
+			fi
+			rm -rf "$MODDIR/apktmp"
+			endtime 2 "$name1恢複" && echoRgb "完成$((i * 100 / r))%" && echoRgb "____________________________________" "3"
+		else
+			echoRgb "$Backup_folder資料夾遺失，無法恢複" "0"
+		fi
+		if [[ $i == $r ]]; then
+			endtime 1 "應用恢復"
+			if [[ -d $Backup_folder2 ]]; then
+				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
+					find "$Backup_folder2" -maxdepth 1 -name "*.tar*" -type f | while read; do
+						starttime2="$(date -u "+%s")"
+						echoRgb "恢復第$A/$B個壓縮包 剩下$((B - A))個"
+						Release_data "$REPLY"
+						endtime 2 "$FILE_NAME2恢複" && echoRgb "完成$((A * 100 / B))%" && echoRgb "____________________________________" "3" && let A++
+					done
+					endtime 1 "自定義恢復"
+				fi
 			fi
 		fi
-		rm -rf "$MODDIR/apktmp"
-		endtime 2 "$name1恢複" && echoRgb "完成$((i*100/r))%" && echoRgb "____________________________________" "3"
-	else
-		echoRgb "$Backup_folder資料夾遺失，無法恢複" "0"
-	fi
-	if [[ $i = $r ]]; then
-		endtime 1 "應用恢復"
-		if [[ -d $Backup_folder2 ]]; then
-			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
-				find "$Backup_folder2" -maxdepth 1 -name "*.tar*" -type f | while read; do
-					starttime2="$(date -u "+%s")"
-					echoRgb "恢復第$A/$B個壓縮包 剩下$((B-A))個"
-					Release_data "$REPLY"
-					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"/*
-} &
+		let i++ en++ nskg++
+	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,73 +5,73 @@ 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
-	echoRgb "$Backup_folder/app_details遺失，無法獲取包名" "0" && exit 1
-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
-	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
-		esac
-		echo_log "${apkfile##*/}解壓縮" && [[ -f $Backup_folder/nmsl.apk ]] && cp -r "$Backup_folder/nmsl.apk" "$TMPDIR"
+	Backup_folder="$MODDIR"
+	if [[ ! -f $Backup_folder/app_details ]]; then
+		echoRgb "$Backup_folder/app_details遺失，無法獲取包名" "0" && exit 1
 	else
-		echoRgb "你的Apk壓縮包離家出走了，可能備份後移動過程遺失了\n -解決辦法手動安裝Apk後再執行恢復腳本" "0"
+		. "$Backup_folder/app_details"
 	fi
-	if [[ $result = 0 ]]; then
-		case $(find "$TMPDIR" -maxdepth 1 -name "*.apk" -type f 2>/dev/null | wc -l) in
-		1)
-			echoRgb "恢復普通apk"
-			pm install -i com.android.vending --user 0 -r "$TMPDIR"/*.apk >/dev/null 2>&1
-			echo_log "Apk安裝"
-			;;
-		0)
-			echoRgb "$TMPDIR中沒有apk" "0"
-			;;
-		*)
-			echoRgb "恢復split apk"
-			b="$(pm install-create -i com.android.vending --user 0 | grep -Eo '[0-9]+')"
-			if [[ -f $TMPDIR/nmsl.apk ]]; then
-				pm install --user 0 -r "$TMPDIR/nmsl.apk" >/dev/null 2>&1
-				echo_log "nmsl.apk安裝"
-			fi
-			find "$TMPDIR" -maxdepth 1 -name "*.apk" -type f | grep -v 'nmsl.apk' |  while read; do
-				pm install-write "$b" "${REPLY##*/}" "$REPLY" >/dev/null 2>&1
-				echo_log "${REPLY##*/}安裝"
-			done
-			pm install-commit "$b" >/dev/null 2>&1
-			echo_log "split Apk安裝"
-			;;
-		esac
+	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"/*
+			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
+				;;
+			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
+			case $(find "$TMPDIR" -maxdepth 1 -name "*.apk" -type f 2>/dev/null | wc -l) in
+			1)
+				echoRgb "恢復普通apk"
+				pm install -i com.android.vending --user 0 -r "$TMPDIR"/*.apk >/dev/null 2>&1
+				echo_log "Apk安裝"
+				;;
+			0)
+				echoRgb "$TMPDIR中沒有apk" "0"
+				;;
+			*)
+				echoRgb "恢復split apk"
+				b="$(pm install-create -i com.android.vending --user 0 | grep -Eo '[0-9]+')"
+				if [[ -f $TMPDIR/nmsl.apk ]]; then
+					pm install --user 0 -r "$TMPDIR/nmsl.apk" >/dev/null 2>&1
+					echo_log "nmsl.apk安裝"
+				fi
+				find "$TMPDIR" -maxdepth 1 -name "*.apk" -type f | grep -v 'nmsl.apk' | while read; do
+					pm install-write "$b" "${REPLY##*/}" "$REPLY" >/dev/null 2>&1
+					echo_log "${REPLY##*/}安裝"
+				done
+				pm install-commit "$b" >/dev/null 2>&1
+				echo_log "split Apk安裝"
+				;;
+			esac
+		fi
+	else
+		echoRgb "存在當前系統中略過安裝Apk"
 	fi
-else
-	echoRgb "存在當前系統中略過安裝Apk"
-fi
-if [[ $Recovery_mode = true ]]; then
 	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`