diff --git a/tools/bin/appinfo.dex b/tools/bin/appinfo.dex index 7752f5f..702d229 100644 Binary files a/tools/bin/appinfo.dex and b/tools/bin/appinfo.dex differ diff --git a/tools/bin/bin.sh b/tools/bin/bin.sh index d70e745..a9f1858 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.1 2021/11/3-22:25" +backup_version="V11 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 2b7f84e..6f1d3e6 100644 --- a/tools/script/restore +++ b/tools/script/restore @@ -149,7 +149,7 @@ while [[ $i -le $r ]]; do if [[ $Recovery_mode = true ]]; then if [[ $(pm path "$name2") != "" ]]; then #停止應用 - [[ $name2 != $Open_apps ]] && am force-stop "$name2" + [[ $name1 != $Open_apps ]] && am force-stop "$name2" find "$Backup_folder" -maxdepth 1 ! -name "apk.*" -name "*.tar*" -type f | sort | while read; do Release_data "$REPLY" done diff --git a/tools/script/restore2 b/tools/script/restore2 index d843ee6..c42937a 100644 --- a/tools/script/restore2 +++ b/tools/script/restore2 @@ -70,7 +70,7 @@ fi if [[ $Recovery_mode = true ]]; then if [[ $(pm path "$name") != "" ]]; then #停止應用 - [[ $name != $Open_apps ]] && am force-stop "$name" + [[ $name2 != $Open_apps ]] && am force-stop "$name" find "$Backup_folder" -maxdepth 1 ! -name "apk.*" -name "*.tar*" -type f | sort | while read; do tar_path="$REPLY" X="$path2/$name" diff --git a/tools/script/restore3 b/tools/script/restore3 index 66953d8..dea8b7c 100644 --- a/tools/script/restore3 +++ b/tools/script/restore3 @@ -18,9 +18,9 @@ Release_data() { FILE_NAME2="${FILE_NAME%%.*}" echoRgb "恢復$FILE_NAME2數據" "2" && usertar="1" case ${FILE_NAME##*.} in - lz4) pv "$1" | tar -I lz4 -xmPpf - ; Set_back ;; - zst) pv "$1" | tar -I zstd -xmPpf - ;; - tar) pv "$1" | tar -xmPpf - ;; + lz4) pv "$1" | tar -I lz4 -xPpf - ; Set_back ;; + zst) pv "$1" | tar -I zstd -xPpf - ;; + tar) pv "$1" | tar -xPpf - ;; *) (echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0" ; Set_back) esac echo_log "$FILE_NAME 解壓縮($FILE_NAME2)" diff --git a/備份應用.sh b/備份應用.sh index 2c22df6..3635dbb 100644 --- a/備份應用.sh +++ b/備份應用.sh @@ -103,7 +103,7 @@ Backup_apk() { rm -rf "$Backup_folder"/*.apk #備份apk echoRgb "$1" - [[ $name2 != $Open_apps ]] && am force-stop "$name2" + [[ $name1 != $Open_apps ]] && am force-stop "$name2" echo "$apk_path" | sed -e '/^$/d' | while read; do path="$REPLY" b_size="$(ls -l "$path" | awk '{print $5}')" @@ -151,7 +151,7 @@ Backup_data() { esac if [[ -d $data_path ]]; then if [[ $Size != $(du -ks "$data_path" | awk '{print $1}') ]]; then - [[ $name2 != $Open_apps ]] && am force-stop "$name2" + [[ $name1 != $Open_apps ]] && am force-stop "$name2" [[ $lxj -ge 95 ]] && echoRgb "$data空間不足,達到$lxj%" "0" && exit 2 echoRgb "備份$1數據" "2" case $1 in diff --git a/生成應用列表.sh b/生成應用列表.sh index 8cb4f31..5c91d06 100644 --- a/生成應用列表.sh +++ b/生成應用列表.sh @@ -53,7 +53,7 @@ appinfo -sort-i -d " " -o ands,pn -pn $system $launcher_app -3 2>/dev/null | sed fi [[ $xz != "" ]] && let i++ bn++ done -[[ -f $nametxt ]] && (sed -ie '/^$/d' "$nametxt" && rm -rf "$MODDIR/應用列表.txte") || (echoRgb "$nametxt生成失敗" "0" && exit 2) +[[ -f $nametxt ]] && (cat "$nametxt" | sed -e '/^$/d' >"$nametxt.tmp" && mv "$nametxt.tmp" "$nametxt") || (echoRgb "$nametxt生成失敗" "0" && exit 2) endtime 1 [[ ! -e $MODDIR/tmp ]] && echoRgb "無新增應用" || echoRgb "輸出包名結束 請查看$nametxt" rm -rf "$MODDIR/tmp" \ No newline at end of file