From def4efc213f2200d3a841765df189c1191ad1f23 Mon Sep 17 00:00:00 2001
From: YAWAsau <229953100a@gmail.com>
Date: Sat, 23 Oct 2021 12:16:55 +0800
Subject: [PATCH] bug fix

---
 tools/script/Get_DirName | 2 +-
 tools/script/restore     | 8 ++++----
 tools/script/restore2    | 8 ++++----
 備份應用.sh              | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/script/Get_DirName b/tools/script/Get_DirName
index d288a50..d98cbb1 100644
--- a/tools/script/Get_DirName
+++ b/tools/script/Get_DirName
@@ -1,6 +1,6 @@
 #!/system/bin/sh
 MODDIR="${0%/*}"
-bin_path="$MODDIR/bin"
+bin_path="$MODDIR/tools/bin"
 [[ ! -d $bin_path ]] && echo "$bin_path目錄遺失" && exit 1
 txt="$MODDIR/應用列表.txt"
 . "$bin_path/bin.sh"
diff --git a/tools/script/restore b/tools/script/restore
index 37d0f8e..9d4c434 100644
--- a/tools/script/restore
+++ b/tools/script/restore
@@ -33,17 +33,17 @@ Release_data() {
 			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
 		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)"
@@ -101,7 +101,7 @@ while [[ $i -le $r ]]; do
 				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
diff --git a/tools/script/restore2 b/tools/script/restore2
index 5a3c288..97f34db 100644
--- a/tools/script/restore2
+++ b/tools/script/restore2
@@ -36,7 +36,7 @@ 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
@@ -86,17 +86,17 @@ if [[ $(pm path "$name") != "" ]]; then
 				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
 			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)"
diff --git a/備份應用.sh b/備份應用.sh
index ead13da..32cf8ed 100644
--- a/備份應用.sh
+++ b/備份應用.sh
@@ -142,12 +142,12 @@ Backup_apk() {
 }
 #檢測數據位置進行備份
 Backup_data() {
-	unset  zsize
+	unset zsize
 	case $1 in
 	user) Size="$userSize" && data_path="$path2/$name" ;;
 	data) Size="$dataSize" && data_path="$path/$1/$name" ;;
 	obb) Size="$obbSize" && data_path="$path/$1/$name" ;;
-	*) [[ -f $app_details ]] && Size="$(cat "$app_details" | awk "/$1Size/"'{print $1}' | cut -f2 -d '=' | tail -n1 | sed 's/\"//g')" ; data_path="$2" ; 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_method=tar && zsize=1
 	esac
 	if [[ -d $data_path ]]; then
 		if [[ $Size != $(du -ks "$data_path" | awk '{print $1}') ]]; then