From c462013f94a3b9c5792a8f0889a88938fd21a517 Mon Sep 17 00:00:00 2001
From: YAWAsau <229953100a@gmail.com>
Date: Fri, 7 Jan 2022 21:57:34 +0800
Subject: [PATCH] bug fix

---
 Getlist.sh                 |  4 ++--
 backup.sh                  | 27 ++++++++++++++++-----------
 tools/bin/bin.sh           |  2 +-
 tools/bin/busybox_path     |  1 -
 tools/script/delete_backup |  2 +-
 tools/script/restore       | 26 +++++++++++++-------------
 tools/script/restore2      | 18 +++++++++---------
 tools/script/restore3      |  6 +++---
 8 files changed, 45 insertions(+), 41 deletions(-)
 delete mode 100644 tools/bin/busybox_path

diff --git a/Getlist.sh b/Getlist.sh
index f9cfc7b..9d38a2a 100644
--- a/Getlist.sh
+++ b/Getlist.sh
@@ -56,10 +56,10 @@ if [[ -f $nametxt ]]; then
 		name=($REPLY $REPLY)
 		if [[ $REPLY != "" && $(pm path "${name[1]}" | cut -f2 -d ':') = "" ]]; then
 			echoRgb "${name[2]}不存在系統，從列表中刪除"
-			cat "$nametxt" | sed -e "s/$REPLY//g ; /^$/d" >"$nametxt.tmp" && mv "$nametxt.tmp" "$nametxt"
+			echo "$(cat "$nametxt" | sed -e "s/$REPLY//g ; /^$/d")" >"$nametxt"
 		fi
 	done
-	cat "$nametxt" | sed -e '/^$/d' >"$nametxt.tmp" && mv "$nametxt.tmp" "$nametxt"
+	echo "$(cat "$nametxt" | sed -e '/^$/d')" >"$nametxt"
 fi
 endtime 1
 [[ ! -e $MODDIR/tmp ]] && echoRgb "無新增應用" || echoRgb "輸出包名結束 請查看$nametxt"
diff --git a/backup.sh b/backup.sh
index 116fa1b..540157c 100644
--- a/backup.sh
+++ b/backup.sh
@@ -43,9 +43,8 @@ else
 	cat "$txt" | grep -v "#" | while read; do
 		name=($REPLY $REPLY)
 		if [[ $REPLY != "" && $(pm path "${name[1]}" | cut -f2 -d ':') == "" ]]; then
-			echo "$REPLY"
 			echoRgb "${name[2]}不存在系統，從列表中刪除"
-			cat "$txt" | sed -e "s/$REPLY//g ; /^$/d" >"$txt.tmp" && mv "$txt.tmp" "$txt"
+			echo "$(cat "$txt" | sed -e "s/$REPLY//g ; /^$/d")" > "$txt"
 		fi
 	done
 	cat "$txt" | sed -e '/^$/d' >"$txt.tmp" && mv "$txt.tmp" "$txt"
@@ -61,10 +60,12 @@ if [[ $Output_path != "" ]]; then
 	Backup="$Output_path/Backup_$Compression_method"
 	outshow="使用自定義目錄\n -輸出位置↓↓↓\n -$Backup"
 else
-	Backup="$MODDIR/Backup_$Compression_method"
 	if [[ $APP_ENV == 1 ]]; then
 		Backup="/storage/emulated/0/Backup_$Compression_method"
 		outshow="沒有設定備份目錄 使用默認路徑↓↓↓\n -$Backup"
+	else
+		Backup="$MODDIR/Backup_$Compression_method"
+		outshow="使用當前路徑作為備份目錄↓↓↓\n -$Backup"
 	fi
 fi
 if [[ $PU != "" ]]; then
@@ -95,6 +96,7 @@ if [[ $PU != "" ]]; then
 else
 	echoRgb "沒有檢測到隨身碟於本地備份" "1"
 fi
+rm -rf "$Backup/STOP"
 #全部顯示 
 #echoRgb "$hx備份資料夾所使用分區統計如下↓\n -$(df -h "$data" | sed -n 's|% /.*|%|p' | awk '{print $(NF-3),$(NF-2),$(NF-1),$(NF)}' | awk 'END{print "總大小:"$1"已使用:"$2"剩餘:"$3"使用率:"$4}')"
 #簡單顯示
@@ -143,12 +145,14 @@ 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"
-			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
+			(
+				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
+			)
 			echo_log "備份$apk_number個Apk"
 			if [[ $result == 0 ]]; then
 				#pm list packages --show-versioncode "$name2"
@@ -200,7 +204,7 @@ Backup_data() {
 				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 >"$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 | 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 -| lz4 -1 >"$Backup_folder/$1.tar.lz4" ;;
+				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 | lz4 -1 >"$Backup_folder/$1.tar.lz4" ;;
 				esac
 				;;
 			*)
@@ -277,6 +281,7 @@ en=118
 					[[ -f $app_details ]] && . "$app_details"
 				fi
 			fi
+			[[ -f $Backup/STOP ]] && echoRgb "離開腳本" "0" && exit 1
 			Occupation_status="$(df -h "$data" | sed -n 's|% /.*|%|p' | awk '{print $(NF-1),$(NF)}')"
 			lxj="$(echo "$Occupation_status" | awk '{print $3}' | sed 's/%//g')"
 			[[ $hx == USB && $PT == "" ]] && echoRgb "隨身碟意外斷開 請檢查穩定性" "0" && exit 1
@@ -361,4 +366,4 @@ en=118
 	longToast "批量備份完成"
 	Print "批量備份完成 執行過程請查看$Status_log"
 	exit 0
-}
\ No newline at end of file
+} &
\ No newline at end of file
diff --git a/tools/bin/bin.sh b/tools/bin/bin.sh
index a8c359b..aac8264 100644
--- a/tools/bin/bin.sh
+++ b/tools/bin/bin.sh
@@ -20,7 +20,7 @@ else
 	echo "Magisk busybox Path does not exist"
 fi
 export PATH="$PATH"
-backup_version="V13.6"
+backup_version="V13.7"
 #設置二進制命令目錄位置
 [[ $bin_path == "" ]] && echo "未正確指定bin.sh位置" && exit 2
 #bin_path="${bin_path/'/storage/emulated/'/'/data/media/'}"
diff --git a/tools/bin/busybox_path b/tools/bin/busybox_path
deleted file mode 100644
index cd3dde5..0000000
--- a/tools/bin/busybox_path
+++ /dev/null
@@ -1 +0,0 @@
-/data/backup_tools
diff --git a/tools/script/delete_backup b/tools/script/delete_backup
index 8bcbfd4..93fd0ff 100644
--- a/tools/script/delete_backup
+++ b/tools/script/delete_backup
@@ -15,7 +15,7 @@ find "$MODDIR" -maxdepth 2 -type d | sort | while read; do
 			echoRgb "${REPLY##*/}不存在系統，刪除備份"
 			rm -rf "$REPLY"
 			if [[ ${REPLY%/*}/應用列表.txt ]]; then
-				cat "${REPLY%/*}/應用列表.txt" | sed -e "s/${REPLY##*/} $PackageName//g ; /^$/d" | sort >"${REPLY%/*}/應用列表.tmp" && mv "${REPLY%/*}/應用列表.tmp" "${REPLY%/*}/應用列表.txt"
+				echo "$(cat "${REPLY%/*}/應用列表.txt" | sed -e "s/${REPLY##*/} $PackageName//g ; /^$/d" | sort)" >"${REPLY%/*}/應用列表.txt"
 			fi
 		fi
 	fi
diff --git a/tools/script/restore b/tools/script/restore
index 425554c..c4b891d 100644
--- a/tools/script/restore
+++ b/tools/script/restore
@@ -30,9 +30,9 @@ Release_data() {
 	user)
 		if [[ -d $X ]]; then
 			case ${FILE_NAME##*.} in
-			lz4) pv -f "$tar_path" | tar --recursive-unlink -I lz4 -xmpf - -C "$path2" ;;
-			zst) pv -f "$tar_path" | tar --recursive-unlink -I zstd -xmpf - -C "$path2" ;;
-			tar) pv -f "$tar_path" | tar --recursive-unlink -xmpf - -C "$path2" ;;
+			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
@@ -45,9 +45,9 @@ Release_data() {
 		;;
 	data | obb)
 		case ${FILE_NAME##*.} in
-		lz4) pv -f "$tar_path" | tar --recursive-unlink -I lz4 -xmPpf - ;;
-		zst) pv -f "$tar_path" | tar --recursive-unlink -I zstd -xmPpf - ;;
-		tar) pv -f "$tar_path" | tar --recursive-unlink -xmPpf - ;;
+		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
@@ -57,9 +57,9 @@ Release_data() {
 	*)
 		[[ $FILE_NAME2 == thanox ]] && rm -rf "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)"
 		case ${FILE_NAME##*.} in
-		lz4) pv -f "$tar_path" | tar -I lz4 -xPpf - ;;
-		zst) pv -f "$tar_path" | tar -I zstd -xPpf - ;;
-		tar) pv -f "$tar_path" | tar -xPpf - ;;
+		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
@@ -142,9 +142,9 @@ en=118
 				if [[ $apkfile != "" ]]; then
 					rm -rf "$TMPDIR"/*
 					case ${apkfile##*.} in
-					lz4) pv -f "$apkfile" | tar -I lz4 -xmpf - -C "$TMPDIR" ;;
-					zst) pv -f "$apkfile" | tar -I zstd -xmpf - -C "$TMPDIR" ;;
-					tar) pv -f "$apkfile" | tar -xmpf - -C "$TMPDIR" ;;
+					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
@@ -226,4 +226,4 @@ en=118
 	echoRgb "批量恢複完成" && endtime 1 "批量恢複開始到結束" && echoRgb "如發現應用閃退請重新開機"
 	longToast "批量恢復完成"
 	Print "批量恢復完成 執行過程請查看$Status_log" && rm -rf "$TMPDIR"/*
-}
+} &
diff --git a/tools/script/restore2 b/tools/script/restore2
index d3842e0..88d471a 100644
--- a/tools/script/restore2
+++ b/tools/script/restore2
@@ -33,9 +33,9 @@ starttime1="$(date -u "+%s")"
 		if [[ $apkfile != "" ]]; then
 			rm -rf "$TMPDIR"/*
 			case ${apkfile##*.} in
-			lz4) pv -f "$apkfile" | tar -I lz4 -xmpf - -C "$TMPDIR" ;;
-			zst) pv -f "$apkfile" | tar -I zstd -xmpf - -C "$TMPDIR" ;;
-			tar) pv -f "$apkfile" | tar -xmpf - -C "$TMPDIR" ;;
+			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
@@ -86,9 +86,9 @@ starttime1="$(date -u "+%s")"
 			if [[ $FILE_NAME2 == user ]]; then
 				if [[ -d $X ]]; then
 					case ${FILE_NAME##*.} in
-					lz4) pv -f "$tar_path" | tar --recursive-unlink -I lz4 -xmpf - -C "$path2" ;;
-					zst) pv -f "$tar_path" | tar --recursive-unlink -I zstd -xmpf - -C "$path2" ;;
-					tar) pv -f "$tar_path" | tar --recursive-unlink -xmpf - -C "$path2" ;;
+					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
@@ -101,9 +101,9 @@ starttime1="$(date -u "+%s")"
 			else
 				[[ $FILE_NAME2 == thanox ]] && rm -rf "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)"
 				case ${FILE_NAME##*.} in
-				lz4) pv -f "$tar_path" | tar --recursive-unlink -I lz4 -xmPpf - ;;
-				zst) pv -f "$tar_path" | tar --recursive-unlink -I zstd -xmPpf - ;;
-				tar) pv -f "$tar_path" | tar --recursive-unlink -xmPpf - ;;
+				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
diff --git a/tools/script/restore3 b/tools/script/restore3
index 3d03946..8419e20 100644
--- a/tools/script/restore3
+++ b/tools/script/restore3
@@ -24,9 +24,9 @@ Release_data() {
 	FILE_NAME2="${FILE_NAME%%.*}"
 	echoRgb "恢復$FILE_NAME2數據" "2" && usertar="1"
 	case ${FILE_NAME##*.} in
-	lz4) pv -f "$1" | tar -I lz4 -xPpf - ; Set_back ;;
-	zst) pv -f "$1" | tar -I zstd -xPpf - ;;
-	tar) pv -f "$1" | tar -xPpf - ;;
+	lz4) pv "$1" | tar -I lz4 -xPpf - ; Set_back ;;
+	zst) pv "$1" | tar -I zstd -xPpf - ;;
+	tar) pv "$1" | tar -xPpf - ;;
 	*) (echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0" ; Set_back)
 	esac
 	echo_log "$FILE_NAME 解壓縮($FILE_NAME2)"