bug fix
This commit is contained in:
@@ -56,10 +56,10 @@ if [[ -f $nametxt ]]; then
|
|||||||
name=($REPLY $REPLY)
|
name=($REPLY $REPLY)
|
||||||
if [[ $REPLY != "" && $(pm path "${name[1]}" | cut -f2 -d ':') = "" ]]; then
|
if [[ $REPLY != "" && $(pm path "${name[1]}" | cut -f2 -d ':') = "" ]]; then
|
||||||
echoRgb "${name[2]}不存在系統,從列表中刪除"
|
echoRgb "${name[2]}不存在系統,從列表中刪除"
|
||||||
cat "$nametxt" | sed -e "s/$REPLY//g ; /^$/d" >"$nametxt.tmp" && mv "$nametxt.tmp" "$nametxt"
|
echo "$(cat "$nametxt" | sed -e "s/$REPLY//g ; /^$/d")" >"$nametxt"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
cat "$nametxt" | sed -e '/^$/d' >"$nametxt.tmp" && mv "$nametxt.tmp" "$nametxt"
|
echo "$(cat "$nametxt" | sed -e '/^$/d')" >"$nametxt"
|
||||||
fi
|
fi
|
||||||
endtime 1
|
endtime 1
|
||||||
[[ ! -e $MODDIR/tmp ]] && echoRgb "無新增應用" || echoRgb "輸出包名結束 請查看$nametxt"
|
[[ ! -e $MODDIR/tmp ]] && echoRgb "無新增應用" || echoRgb "輸出包名結束 請查看$nametxt"
|
||||||
|
|||||||
27
backup.sh
27
backup.sh
@@ -43,9 +43,8 @@ else
|
|||||||
cat "$txt" | grep -v "#" | while read; do
|
cat "$txt" | grep -v "#" | while read; do
|
||||||
name=($REPLY $REPLY)
|
name=($REPLY $REPLY)
|
||||||
if [[ $REPLY != "" && $(pm path "${name[1]}" | cut -f2 -d ':') == "" ]]; then
|
if [[ $REPLY != "" && $(pm path "${name[1]}" | cut -f2 -d ':') == "" ]]; then
|
||||||
echo "$REPLY"
|
|
||||||
echoRgb "${name[2]}不存在系統,從列表中刪除"
|
echoRgb "${name[2]}不存在系統,從列表中刪除"
|
||||||
cat "$txt" | sed -e "s/$REPLY//g ; /^$/d" >"$txt.tmp" && mv "$txt.tmp" "$txt"
|
echo "$(cat "$txt" | sed -e "s/$REPLY//g ; /^$/d")" > "$txt"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
cat "$txt" | sed -e '/^$/d' >"$txt.tmp" && mv "$txt.tmp" "$txt"
|
cat "$txt" | sed -e '/^$/d' >"$txt.tmp" && mv "$txt.tmp" "$txt"
|
||||||
@@ -61,10 +60,12 @@ if [[ $Output_path != "" ]]; then
|
|||||||
Backup="$Output_path/Backup_$Compression_method"
|
Backup="$Output_path/Backup_$Compression_method"
|
||||||
outshow="使用自定義目錄\n -輸出位置↓↓↓\n -$Backup"
|
outshow="使用自定義目錄\n -輸出位置↓↓↓\n -$Backup"
|
||||||
else
|
else
|
||||||
Backup="$MODDIR/Backup_$Compression_method"
|
|
||||||
if [[ $APP_ENV == 1 ]]; then
|
if [[ $APP_ENV == 1 ]]; then
|
||||||
Backup="/storage/emulated/0/Backup_$Compression_method"
|
Backup="/storage/emulated/0/Backup_$Compression_method"
|
||||||
outshow="沒有設定備份目錄 使用默認路徑↓↓↓\n -$Backup"
|
outshow="沒有設定備份目錄 使用默認路徑↓↓↓\n -$Backup"
|
||||||
|
else
|
||||||
|
Backup="$MODDIR/Backup_$Compression_method"
|
||||||
|
outshow="使用當前路徑作為備份目錄↓↓↓\n -$Backup"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [[ $PU != "" ]]; then
|
if [[ $PU != "" ]]; then
|
||||||
@@ -95,6 +96,7 @@ if [[ $PU != "" ]]; then
|
|||||||
else
|
else
|
||||||
echoRgb "沒有檢測到隨身碟於本地備份" "1"
|
echoRgb "沒有檢測到隨身碟於本地備份" "1"
|
||||||
fi
|
fi
|
||||||
|
rm -rf "$Backup/STOP"
|
||||||
#全部顯示
|
#全部顯示
|
||||||
#echoRgb "$hx備份資料夾所使用分區統計如下↓\n -$(df -h "$data" | sed -n 's|% /.*|%|p' | awk '{print $(NF-3),$(NF-2),$(NF-1),$(NF)}' | awk 'END{print "總大小:"$1"已使用:"$2"剩餘:"$3"使用率:"$4}')"
|
#echoRgb "$hx備份資料夾所使用分區統計如下↓\n -$(df -h "$data" | sed -n 's|% /.*|%|p' | awk '{print $(NF-3),$(NF-2),$(NF-1),$(NF)}' | awk 'END{print "總大小:"$1"已使用:"$2"剩餘:"$3"使用率:"$4}')"
|
||||||
#簡單顯示
|
#簡單顯示
|
||||||
@@ -143,12 +145,14 @@ Backup_apk() {
|
|||||||
m_size="$(awk 'BEGIN{printf "%.2f\n", "'$k_size'"/'1024'}')"
|
m_size="$(awk 'BEGIN{printf "%.2f\n", "'$k_size'"/'1024'}')"
|
||||||
echoRgb "${path##*/} ${m_size}MB(${k_size}KB)" "2"
|
echoRgb "${path##*/} ${m_size}MB(${k_size}KB)" "2"
|
||||||
done
|
done
|
||||||
cd "$apk_path2"
|
(
|
||||||
case $Compression_method in
|
cd "$apk_path2"
|
||||||
tar | TAR | Tar) tar -cf "$Backup_folder/apk.tar" *.apk ;;
|
case $Compression_method in
|
||||||
lz4 | LZ4 | Lz4) tar -cf - *.apk | lz4 -1 >"$Backup_folder/apk.tar.lz4" ;;
|
tar | TAR | Tar) tar -cf "$Backup_folder/apk.tar" *.apk ;;
|
||||||
zstd | Zstd | ZSTD) tar -cf - *apk | zstd -r -T0 --ultra -6 -q >"$Backup_folder/apk.tar.zst" ;;
|
lz4 | LZ4 | Lz4) tar -cf - *.apk | lz4 -1 >"$Backup_folder/apk.tar.lz4" ;;
|
||||||
esac
|
zstd | Zstd | ZSTD) tar -cf - *apk | zstd -r -T0 --ultra -6 -q >"$Backup_folder/apk.tar.zst" ;;
|
||||||
|
esac
|
||||||
|
)
|
||||||
echo_log "備份$apk_number個Apk"
|
echo_log "備份$apk_number個Apk"
|
||||||
if [[ $result == 0 ]]; then
|
if [[ $result == 0 ]]; then
|
||||||
#pm list packages --show-versioncode "$name2"
|
#pm list packages --show-versioncode "$name2"
|
||||||
@@ -200,7 +204,7 @@ Backup_data() {
|
|||||||
case $Compression_method in
|
case $Compression_method in
|
||||||
tar | Tar | TAR) tar --exclude="${data_path##*/}/.ota" --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/lib" -cpf - -C "${data_path%/*}" "${data_path##*/}" 2>/dev/null | pv >"$Backup_folder/$1.tar" ;;
|
tar | Tar | TAR) tar --exclude="${data_path##*/}/.ota" --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/lib" -cpf - -C "${data_path%/*}" "${data_path##*/}" 2>/dev/null | pv >"$Backup_folder/$1.tar" ;;
|
||||||
zstd | Zstd | ZSTD) tar --exclude="${data_path##*/}/.ota" --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/lib" -cpf - -C "${data_path%/*}" "${data_path##*/}" 2>/dev/null | pv | zstd -r -T0 --ultra -6 -q >"$Backup_folder/$1.tar.zst" ;;
|
zstd | Zstd | ZSTD) tar --exclude="${data_path##*/}/.ota" --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/lib" -cpf - -C "${data_path%/*}" "${data_path##*/}" 2>/dev/null | pv | zstd -r -T0 --ultra -6 -q >"$Backup_folder/$1.tar.zst" ;;
|
||||||
lz4 | Lz4 | LZ4) tar --exclude="${data_path##*/}/.ota" --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/lib" -cpf - -C "${data_path%/*}" "${data_path##*/}" 2>/dev/null | pv -| lz4 -1 >"$Backup_folder/$1.tar.lz4" ;;
|
lz4 | Lz4 | LZ4) tar --exclude="${data_path##*/}/.ota" --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/lib" -cpf - -C "${data_path%/*}" "${data_path##*/}" 2>/dev/null | pv | lz4 -1 >"$Backup_folder/$1.tar.lz4" ;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
@@ -277,6 +281,7 @@ en=118
|
|||||||
[[ -f $app_details ]] && . "$app_details"
|
[[ -f $app_details ]] && . "$app_details"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
[[ -f $Backup/STOP ]] && echoRgb "離開腳本" "0" && exit 1
|
||||||
Occupation_status="$(df -h "$data" | sed -n 's|% /.*|%|p' | awk '{print $(NF-1),$(NF)}')"
|
Occupation_status="$(df -h "$data" | sed -n 's|% /.*|%|p' | awk '{print $(NF-1),$(NF)}')"
|
||||||
lxj="$(echo "$Occupation_status" | awk '{print $3}' | sed 's/%//g')"
|
lxj="$(echo "$Occupation_status" | awk '{print $3}' | sed 's/%//g')"
|
||||||
[[ $hx == USB && $PT == "" ]] && echoRgb "隨身碟意外斷開 請檢查穩定性" "0" && exit 1
|
[[ $hx == USB && $PT == "" ]] && echoRgb "隨身碟意外斷開 請檢查穩定性" "0" && exit 1
|
||||||
@@ -361,4 +366,4 @@ en=118
|
|||||||
longToast "批量備份完成"
|
longToast "批量備份完成"
|
||||||
Print "批量備份完成 執行過程請查看$Status_log"
|
Print "批量備份完成 執行過程請查看$Status_log"
|
||||||
exit 0
|
exit 0
|
||||||
}
|
} &
|
||||||
@@ -20,7 +20,7 @@ else
|
|||||||
echo "Magisk busybox Path does not exist"
|
echo "Magisk busybox Path does not exist"
|
||||||
fi
|
fi
|
||||||
export PATH="$PATH"
|
export PATH="$PATH"
|
||||||
backup_version="V13.6"
|
backup_version="V13.7"
|
||||||
#設置二進制命令目錄位置
|
#設置二進制命令目錄位置
|
||||||
[[ $bin_path == "" ]] && echo "未正確指定bin.sh位置" && exit 2
|
[[ $bin_path == "" ]] && echo "未正確指定bin.sh位置" && exit 2
|
||||||
#bin_path="${bin_path/'/storage/emulated/'/'/data/media/'}"
|
#bin_path="${bin_path/'/storage/emulated/'/'/data/media/'}"
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
/data/backup_tools
|
|
||||||
@@ -15,7 +15,7 @@ find "$MODDIR" -maxdepth 2 -type d | sort | while read; do
|
|||||||
echoRgb "${REPLY##*/}不存在系統,刪除備份"
|
echoRgb "${REPLY##*/}不存在系統,刪除備份"
|
||||||
rm -rf "$REPLY"
|
rm -rf "$REPLY"
|
||||||
if [[ ${REPLY%/*}/應用列表.txt ]]; then
|
if [[ ${REPLY%/*}/應用列表.txt ]]; then
|
||||||
cat "${REPLY%/*}/應用列表.txt" | sed -e "s/${REPLY##*/} $PackageName//g ; /^$/d" | sort >"${REPLY%/*}/應用列表.tmp" && mv "${REPLY%/*}/應用列表.tmp" "${REPLY%/*}/應用列表.txt"
|
echo "$(cat "${REPLY%/*}/應用列表.txt" | sed -e "s/${REPLY##*/} $PackageName//g ; /^$/d" | sort)" >"${REPLY%/*}/應用列表.txt"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -30,9 +30,9 @@ Release_data() {
|
|||||||
user)
|
user)
|
||||||
if [[ -d $X ]]; then
|
if [[ -d $X ]]; then
|
||||||
case ${FILE_NAME##*.} in
|
case ${FILE_NAME##*.} in
|
||||||
lz4) pv -f "$tar_path" | tar --recursive-unlink -I lz4 -xmpf - -C "$path2" ;;
|
lz4) pv "$tar_path" | tar --recursive-unlink -I lz4 -xmpf - -C "$path2" ;;
|
||||||
zst) pv -f "$tar_path" | tar --recursive-unlink -I zstd -xmpf - -C "$path2" ;;
|
zst) pv "$tar_path" | tar --recursive-unlink -I zstd -xmpf - -C "$path2" ;;
|
||||||
tar) pv -f "$tar_path" | tar --recursive-unlink -xmpf - -C "$path2" ;;
|
tar) pv "$tar_path" | tar --recursive-unlink -xmpf - -C "$path2" ;;
|
||||||
*)
|
*)
|
||||||
echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
|
echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
|
||||||
Set_back
|
Set_back
|
||||||
@@ -45,9 +45,9 @@ Release_data() {
|
|||||||
;;
|
;;
|
||||||
data | obb)
|
data | obb)
|
||||||
case ${FILE_NAME##*.} in
|
case ${FILE_NAME##*.} in
|
||||||
lz4) pv -f "$tar_path" | tar --recursive-unlink -I lz4 -xmPpf - ;;
|
lz4) pv "$tar_path" | tar --recursive-unlink -I lz4 -xmPpf - ;;
|
||||||
zst) pv -f "$tar_path" | tar --recursive-unlink -I zstd -xmPpf - ;;
|
zst) pv "$tar_path" | tar --recursive-unlink -I zstd -xmPpf - ;;
|
||||||
tar) pv -f "$tar_path" | tar --recursive-unlink -xmPpf - ;;
|
tar) pv "$tar_path" | tar --recursive-unlink -xmPpf - ;;
|
||||||
*)
|
*)
|
||||||
echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
|
echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
|
||||||
Set_back
|
Set_back
|
||||||
@@ -57,9 +57,9 @@ Release_data() {
|
|||||||
*)
|
*)
|
||||||
[[ $FILE_NAME2 == thanox ]] && rm -rf "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)"
|
[[ $FILE_NAME2 == thanox ]] && rm -rf "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)"
|
||||||
case ${FILE_NAME##*.} in
|
case ${FILE_NAME##*.} in
|
||||||
lz4) pv -f "$tar_path" | tar -I lz4 -xPpf - ;;
|
lz4) pv "$tar_path" | tar -I lz4 -xPpf - ;;
|
||||||
zst) pv -f "$tar_path" | tar -I zstd -xPpf - ;;
|
zst) pv "$tar_path" | tar -I zstd -xPpf - ;;
|
||||||
tar) pv -f "$tar_path" | tar -xPpf - ;;
|
tar) pv "$tar_path" | tar -xPpf - ;;
|
||||||
*)
|
*)
|
||||||
echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
|
echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
|
||||||
Set_back
|
Set_back
|
||||||
@@ -142,9 +142,9 @@ en=118
|
|||||||
if [[ $apkfile != "" ]]; then
|
if [[ $apkfile != "" ]]; then
|
||||||
rm -rf "$TMPDIR"/*
|
rm -rf "$TMPDIR"/*
|
||||||
case ${apkfile##*.} in
|
case ${apkfile##*.} in
|
||||||
lz4) pv -f "$apkfile" | tar -I lz4 -xmpf - -C "$TMPDIR" ;;
|
lz4) pv "$apkfile" | tar -I lz4 -xmpf - -C "$TMPDIR" ;;
|
||||||
zst) pv -f "$apkfile" | tar -I zstd -xmpf - -C "$TMPDIR" ;;
|
zst) pv "$apkfile" | tar -I zstd -xmpf - -C "$TMPDIR" ;;
|
||||||
tar) pv -f "$apkfile" | tar -xmpf - -C "$TMPDIR" ;;
|
tar) pv "$apkfile" | tar -xmpf - -C "$TMPDIR" ;;
|
||||||
*)
|
*)
|
||||||
echoRgb "${apkfile##*/} 壓縮包不支持解壓縮" "0"
|
echoRgb "${apkfile##*/} 壓縮包不支持解壓縮" "0"
|
||||||
Set_back
|
Set_back
|
||||||
@@ -226,4 +226,4 @@ en=118
|
|||||||
echoRgb "批量恢複完成" && endtime 1 "批量恢複開始到結束" && echoRgb "如發現應用閃退請重新開機"
|
echoRgb "批量恢複完成" && endtime 1 "批量恢複開始到結束" && echoRgb "如發現應用閃退請重新開機"
|
||||||
longToast "批量恢復完成"
|
longToast "批量恢復完成"
|
||||||
Print "批量恢復完成 執行過程請查看$Status_log" && rm -rf "$TMPDIR"/*
|
Print "批量恢復完成 執行過程請查看$Status_log" && rm -rf "$TMPDIR"/*
|
||||||
}
|
} &
|
||||||
|
|||||||
@@ -33,9 +33,9 @@ starttime1="$(date -u "+%s")"
|
|||||||
if [[ $apkfile != "" ]]; then
|
if [[ $apkfile != "" ]]; then
|
||||||
rm -rf "$TMPDIR"/*
|
rm -rf "$TMPDIR"/*
|
||||||
case ${apkfile##*.} in
|
case ${apkfile##*.} in
|
||||||
lz4) pv -f "$apkfile" | tar -I lz4 -xmpf - -C "$TMPDIR" ;;
|
lz4) pv "$apkfile" | tar -I lz4 -xmpf - -C "$TMPDIR" ;;
|
||||||
zst) pv -f "$apkfile" | tar -I zstd -xmpf - -C "$TMPDIR" ;;
|
zst) pv "$apkfile" | tar -I zstd -xmpf - -C "$TMPDIR" ;;
|
||||||
tar) pv -f "$apkfile" | tar -xmpf - -C "$TMPDIR" ;;
|
tar) pv "$apkfile" | tar -xmpf - -C "$TMPDIR" ;;
|
||||||
*)
|
*)
|
||||||
echoRgb "${apkfile##*/} 壓縮包不支持解壓縮" "0"
|
echoRgb "${apkfile##*/} 壓縮包不支持解壓縮" "0"
|
||||||
Set_back
|
Set_back
|
||||||
@@ -86,9 +86,9 @@ starttime1="$(date -u "+%s")"
|
|||||||
if [[ $FILE_NAME2 == user ]]; then
|
if [[ $FILE_NAME2 == user ]]; then
|
||||||
if [[ -d $X ]]; then
|
if [[ -d $X ]]; then
|
||||||
case ${FILE_NAME##*.} in
|
case ${FILE_NAME##*.} in
|
||||||
lz4) pv -f "$tar_path" | tar --recursive-unlink -I lz4 -xmpf - -C "$path2" ;;
|
lz4) pv "$tar_path" | tar --recursive-unlink -I lz4 -xmpf - -C "$path2" ;;
|
||||||
zst) pv -f "$tar_path" | tar --recursive-unlink -I zstd -xmpf - -C "$path2" ;;
|
zst) pv "$tar_path" | tar --recursive-unlink -I zstd -xmpf - -C "$path2" ;;
|
||||||
tar) pv -f "$tar_path" | tar --recursive-unlink -xmpf - -C "$path2" ;;
|
tar) pv "$tar_path" | tar --recursive-unlink -xmpf - -C "$path2" ;;
|
||||||
*)
|
*)
|
||||||
echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
|
echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
|
||||||
Set_back
|
Set_back
|
||||||
@@ -101,9 +101,9 @@ starttime1="$(date -u "+%s")"
|
|||||||
else
|
else
|
||||||
[[ $FILE_NAME2 == thanox ]] && rm -rf "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)"
|
[[ $FILE_NAME2 == thanox ]] && rm -rf "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)"
|
||||||
case ${FILE_NAME##*.} in
|
case ${FILE_NAME##*.} in
|
||||||
lz4) pv -f "$tar_path" | tar --recursive-unlink -I lz4 -xmPpf - ;;
|
lz4) pv "$tar_path" | tar --recursive-unlink -I lz4 -xmPpf - ;;
|
||||||
zst) pv -f "$tar_path" | tar --recursive-unlink -I zstd -xmPpf - ;;
|
zst) pv "$tar_path" | tar --recursive-unlink -I zstd -xmPpf - ;;
|
||||||
tar) pv -f "$tar_path" | tar --recursive-unlink -xmPpf - ;;
|
tar) pv "$tar_path" | tar --recursive-unlink -xmPpf - ;;
|
||||||
*)
|
*)
|
||||||
echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
|
echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
|
||||||
Set_back
|
Set_back
|
||||||
|
|||||||
@@ -24,9 +24,9 @@ Release_data() {
|
|||||||
FILE_NAME2="${FILE_NAME%%.*}"
|
FILE_NAME2="${FILE_NAME%%.*}"
|
||||||
echoRgb "恢復$FILE_NAME2數據" "2" && usertar="1"
|
echoRgb "恢復$FILE_NAME2數據" "2" && usertar="1"
|
||||||
case ${FILE_NAME##*.} in
|
case ${FILE_NAME##*.} in
|
||||||
lz4) pv -f "$1" | tar -I lz4 -xPpf - ; Set_back ;;
|
lz4) pv "$1" | tar -I lz4 -xPpf - ; Set_back ;;
|
||||||
zst) pv -f "$1" | tar -I zstd -xPpf - ;;
|
zst) pv "$1" | tar -I zstd -xPpf - ;;
|
||||||
tar) pv -f "$1" | tar -xPpf - ;;
|
tar) pv "$1" | tar -xPpf - ;;
|
||||||
*) (echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0" ; Set_back)
|
*) (echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0" ; Set_back)
|
||||||
esac
|
esac
|
||||||
echo_log "$FILE_NAME 解壓縮($FILE_NAME2)"
|
echo_log "$FILE_NAME 解壓縮($FILE_NAME2)"
|
||||||
|
|||||||
Reference in New Issue
Block a user