From 1a7f10f554a30b1a899894e28fd141a2ffd1a6bc Mon Sep 17 00:00:00 2001
From: Yawasau <229953100a@gmail.com>
Date: Mon, 29 Aug 2022 21:26:57 +0800
Subject: [PATCH] bugfix

---
 tools/bin/{pv => backup_pv}     | Bin
 tools/bin/{tar => backup_tar}   | Bin
 tools/bin/{zstd => backup_zstd} | Bin
 tools/bin/bin.sh                |  17 ++++++++++++++---
 tools/bin/tools.sh              |  10 ++--------
 5 files changed, 16 insertions(+), 11 deletions(-)
 rename tools/bin/{pv => backup_pv} (100%)
 rename tools/bin/{tar => backup_tar} (100%)
 rename tools/bin/{zstd => backup_zstd} (100%)

diff --git a/tools/bin/pv b/tools/bin/backup_pv
similarity index 100%
rename from tools/bin/pv
rename to tools/bin/backup_pv
diff --git a/tools/bin/tar b/tools/bin/backup_tar
similarity index 100%
rename from tools/bin/tar
rename to tools/bin/backup_tar
diff --git a/tools/bin/zstd b/tools/bin/backup_zstd
similarity index 100%
rename from tools/bin/zstd
rename to tools/bin/backup_zstd
diff --git a/tools/bin/bin.sh b/tools/bin/bin.sh
index 4fc789a..d61513c 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.8"
+backup_version="V15.5.9"
 #設置二進制命令目錄位置
 if [[ $bin_path = "" ]]; then
 	echoRgb "未正確指定bin.sh位置" "0"
@@ -129,6 +129,16 @@ 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 "$@"
+}
 Set_back() {
 	return 1
 }
@@ -211,8 +221,9 @@ kill_Serve() {
 	{
 	script="${0##*/}"
 	if [[ $script != "" ]]; then
-		process_name tar
-		process_name pv
+		process_name backup_tar
+		process_name backup_pv
+		process_name backup_zstd
 	fi
 	} &
 	wait
diff --git a/tools/bin/tools.sh b/tools/bin/tools.sh
index 1b51e98..f414ede 100644
--- a/tools/bin/tools.sh
+++ b/tools/bin/tools.sh
@@ -325,12 +325,6 @@ Backup_apk() {
 					rm -rf "$Backup_folder"
 				fi
 				if [[ $name2 = com.android.chrome ]]; then
-					webview_stat="$(dumpsys webviewupdate)"
-					current_ver="$(echo "$webview_stat" | grep 'Current WebView package' | grep -oE '[0-9\.]{2,}')"
-					current_code="$(echo "$webview_stat" | grep "$current_ver" | grep -oE '[0-9]{9}')"
-					dumpsys package | grep 'name:com.google.android.trichromelibrary' | sed "s/ version:/_/g ; /$current_code/d" | cut -f2 -d ':' | while read ; do
-						pm uninstall "$REPLY"
-					done
 					#刪除所有舊apk ,保留一個最新apk進行備份
 					ReservedNum=1
 					FileNum="$(ls /data/app/*/com.google.android.trichromelibrary_*/base.apk 2>/dev/null | wc -l)"
@@ -484,7 +478,7 @@ Release_data() {
 		else
 			Set_back
 		fi
-		echo_log "$FILE_NAME 解壓縮($FILE_NAME2)"
+		echo_log "解壓縮${FILE_NAME##*.}"
 		if [[ $result = 0 ]]; then
 			[[ -d $TMPPATH ]] && rm -rf "$TMPPATH/PATH"
 			case $FILE_NAME2 in
@@ -666,7 +660,7 @@ Validation_file() {
 	lz4 | zst) zstd -t "$1" &>/dev/null ;;
 	tar) tar -tf "$1" &>/dev/null ;;
 	esac
-	echo_log "效驗$MODDIR_NAME/$FILE_NAME"
+	echo_log "效驗$FILE_NAME"
 }
 Check_archive() {
 	starttime1="$(date -u "+%s")"