diff --git a/tools/bin/bin.sh b/tools/bin/bin.sh index a9f1858..8d0ea9b 100644 --- a/tools/bin/bin.sh +++ b/tools/bin/bin.sh @@ -18,7 +18,7 @@ if [[ -d $(magisk --path 2>/dev/null) ]]; then else echo "Magisk busybox Path does not exist" fi ; export PATH="$PATH" -backup_version="V11 2021/11/5-19:45" +backup_version="V11.2 2021/11/5-19:45" #設置二進制命令目錄位置 [[ $bin_path = "" ]] && echo "未正確指定bin.sh位置" && exit 2 #bin_path="${bin_path/'/storage/emulated/'/'/data/media/'}" diff --git a/tools/script/restore b/tools/script/restore index 6f1d3e6..5772a77 100644 --- a/tools/script/restore +++ b/tools/script/restore @@ -94,7 +94,7 @@ en=118 { while [[ $i -le $r ]]; do [[ $en -ge 229 ]] && en=118 - echoRgb "恢複第$i個應用 總共$r個 剩下$((r-i))個應用" + 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}')" Backup_folder="$MODDIR/$name1" @@ -171,7 +171,7 @@ while [[ $i -le $r ]]; do B="$(find "$Backup_folder2" -maxdepth 1 -name "*.tar*" -type f | wc -l)" if [[ $branch = true ]]; then find "$Backup_folder2" -maxdepth 1 -name "*.tar*" -type f | while read; do - echoRgb "恢復第$A個壓縮包 總共$B個 剩下$((B-A))個" + echoRgb "恢復第$A/$B個壓縮包 剩下$((B-A))個" Release_data "$REPLY" echoRgb "完成$((A*100/B))%" && let A++ done diff --git a/tools/script/restore3 b/tools/script/restore3 index dea8b7c..7851fba 100644 --- a/tools/script/restore3 +++ b/tools/script/restore3 @@ -29,7 +29,7 @@ starttime1="$(date -u "+%s")" A=1 B="$(find "$MODDIR" -maxdepth 1 -name "*.tar*" -type f | wc -l)" find "$MODDIR" -maxdepth 1 -name "*.tar*" -type f | while read; do - echoRgb "恢復第$A個壓縮包 總共$B個 剩下$((B-A))個" + echoRgb "恢復第$A/$B個壓縮包 剩下$((B-A))個" Release_data "$REPLY" echoRgb "完成$((A*100/B))%" && let A++ done diff --git a/備份應用.sh b/備份應用.sh index 3635dbb..6edb9e0 100644 --- a/備份應用.sh +++ b/備份應用.sh @@ -193,7 +193,6 @@ get_version "備份" "不備份" && Backup_user_data="$branch" echoRgb "全部應用備份結束後是否備份自定義目錄\n 音量上備份,音量下不備份" get_version "備份" "不備份" && backup_media="$branch" } -echo "#不需要恢復還原的應用請在開頭注釋# 比如#xxxxxxxx 酷安" >"$script_path/應用列表.txt" #開始循環$txt內的資料進行備份 #記錄開始時間 starttime1="$(date -u "+%s")" @@ -208,7 +207,7 @@ while [[ $i -le $r ]]; do apk_path="$(pm path "$name2" | cut -f2 -d ':')" apk_path2="$(echo "$apk_path" | head -1)" ; apk_path2="${apk_path2%/*}" if [[ -d $apk_path2 ]]; then - echoRgb "備份第$i個應用 總共$r個 剩下$((r-i))個應用" + echoRgb "備份第$i/$r個應用 剩下$((r-i))個" if [[ $name1 = *! || $name1 = *! ]]; then name1="$(echo "$name1" | sed 's/!//g ; s/!//g')" echoRgb "跳過備份$name1 所有數據" "0" @@ -273,7 +272,7 @@ while [[ $i -le $r ]]; do app_details="$Backup_folder/app_details" [[ -f $app_details ]] && . "$app_details" echo "$Custom_path" | grep -v "#" | sed -e '/^$/d' | while read; do - echoRgb "備份第$A個資料夾 總共$B個 剩下$((B-A))個" + echoRgb "備份第$A/$B個資料夾 剩下$((B-A))個" Backup_data "${REPLY##*/}" "$REPLY" echoRgb "完成$((A*100/B))% $hx$(df -h "$data" | awk 'END{print "剩餘:"$3"使用率:"$4}')" && let A++ done