bug fix

tools/bin/bin.sh

@@ -163,6 +163,12 @@ echo_log() {
 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
+if [[ $script != "" && $(pgrep -f "$script" | grep -v grep | wc -l) -ge 2 ]]; then
+	echoRgb "檢測到進程殘留，請重新執行腳本 已銷毀進程" "0"
+	pgrep -f "$script" | grep -v grep | while read i; do
+		[[ $i != "" ]] && kill -9 " $i" >/dev/null
+	done
+fi
 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"/* 

tools/bin/down

@@ -1,2 +0,0 @@
-export CLASSPATH="${0%/*}/down.dex"
-exec app_process /system/bin --nice-name=down Han.download.Down "$@"

tools/script/restore

@@ -2,6 +2,7 @@
 MODDIR="${0%/*}"
 tools_path="$MODDIR/tools"
 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
@@ -101,14 +102,20 @@ en=118
 {
 while [[ $i -le $r ]]; do
 	[[ $en -ge 229 ]] && en=118
-	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}')"
+	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)"
+		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)"
@@ -164,6 +171,7 @@ while [[ $i -le $r ]]; do
 				echoRgb "$name1沒有安裝無法恢復數據" "0"
 			fi
 		fi
+		rm -rf "$MODDIR/apktmp"
 		endtime 2 "$name1恢複" && echoRgb "完成$((i*100/r))%" && echoRgb "____________________________________" "3"
 	else
 		echoRgb "$Backup_folder資料夾遺失，無法恢複" "0"

tools/script/restore2

@@ -2,6 +2,7 @@
 MODDIR="${0%/*}"
 tools_path="${MODDIR%/*}/tools"
 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

tools/script/restore3

@@ -3,6 +3,7 @@ MODDIR="${0%/*}"
 app_details="$MODDIR/app_details"
 tools_path="${tools_path%/*}/tools"
 bin_path="${MODDIR%/*}/tools/bin"
+script="${0##*/}"
 [[ ! -d $tools_path ]] && echo "$tools_path目錄遺失" && exit 1
 [[ ! -d $bin_path ]] && echo "$bin_path目錄遺失" && exit 1
 . "$bin_path/bin.sh"

備份應用.sh

@@ -18,12 +18,6 @@ zstd|Zstd|ZSTD|tar|Tar|TAR|lz4|Lz4|LZ4) ;;
 *) echoRgb "$Compression_method為不支持的壓縮算法" "0" &&  exit 2 ;;
 esac
 [[ ! -f $MODDIR/backup_settings.conf ]] && echoRgb "backup_settings.conf遺失" "0" && exit 1
-if [[ $(pgrep -f "$script" | grep -v grep | wc -l) -ge 2 ]]; then
-	echoRgb "檢測到進程殘留，請重新執行腳本 已銷毀進程" "0"
-	pgrep -f "$script" | grep -v grep | while read i; do
-		[[ $i != "" ]] && kill -9 " $i" >/dev/null
-	done
-fi
 #效驗選填是否正確
 isBoolean "$Lo" && Lo="$nsx"
 if [[ $Lo = false ]]; then