From 2c2a3e97e77d31e32cc22a3797e340014a801994 Mon Sep 17 00:00:00 2001
From: Yawasau <229953100a@gmail.com>
Date: Tue, 30 Aug 2022 18:29:29 +0800
Subject: [PATCH] bugfix

---
 tools/bin/bin.sh            |  23 +++++------------------
 tools/bin/{backup_pv => pv} | Bin
 tools/bin/tools.sh          |   2 ++
 3 files changed, 7 insertions(+), 18 deletions(-)
 rename tools/bin/{backup_pv => pv} (100%)

diff --git a/tools/bin/bin.sh b/tools/bin/bin.sh
index d61513c..4e3a64a 100644
--- a/tools/bin/bin.sh
+++ b/tools/bin/bin.sh
@@ -48,7 +48,7 @@ else
 	echo "Magisk busybox Path does not exist"
 fi
 export PATH="$PATH"
-backup_version="V15.5.9"
+backup_version="V15.6.0"
 #設置二進制命令目錄位置
 if [[ $bin_path = "" ]]; then
 	echoRgb "未正確指定bin.sh位置" "0"
@@ -109,6 +109,7 @@ if [[ -d $bin_path ]]; then
 			fi
 		done
 	fi
+	[[ -f $filepath/backup_zstd ]] && ln -fs "$filepath/backup_zstd" "$filepath/zstd"
 else
 	echoRgb "遺失$bin_path" "0"
 	exit 1
@@ -123,22 +124,8 @@ if [[ $(which busybox) = "" ]]; then
 	exit 1
 fi
 #下列為自定義函數
-appinfo() {
-	exec app_process /system/bin --nice-name=appinfo indi.appinfo.AppInfo "$@"
-}
-down() {
-	exec app_process /system/bin --nice-name=down Han.download.Down "$@"
-}
-unset tar zstd pv
-tar() {
-	backup_tar "$@"
-}
-zstd() {
-	backup_zstd "$@"
-}
-pv() {
-	backup_pv "$@"
-}
+alias appinfo="exec app_process /system/bin --nice-name=appinfo indi.appinfo.AppInfo $@"
+alias down="exec app_process /system/bin --nice-name=down Han.download.Down $@"
 Set_back() {
 	return 1
 }
@@ -222,7 +209,7 @@ kill_Serve() {
 	script="${0##*/}"
 	if [[ $script != "" ]]; then
 		process_name backup_tar
-		process_name backup_pv
+		process_name pv
 		process_name backup_zstd
 	fi
 	} &
diff --git a/tools/bin/backup_pv b/tools/bin/pv
similarity index 100%
rename from tools/bin/backup_pv
rename to tools/bin/pv
diff --git a/tools/bin/tools.sh b/tools/bin/tools.sh
index f414ede..4a40104 100644
--- a/tools/bin/tools.sh
+++ b/tools/bin/tools.sh
@@ -30,6 +30,8 @@ else
 	alias INSTALL="pm install -i com.android.vending --user $user -r -t"
 	alias create="pm install-create -i com.android.vending --user $user -t"
 fi
+alias tar="backup_tar $@"
+alias zstd="backup_zstd $@"
 case $operate in
 backup|Restore|Restore2|Getlist)
 	user_id="$(ls -1 "/data/user" 2>/dev/null)"