bug fix
This commit is contained in:
YAWAsau
@@ -5,73 +5,73 @@ 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
|
||||
. "$MODDIR/recover.conf"
|
||||
. "$bin_path/bin.sh"
|
||||
isBoolean "$Recovery_mode" && Recovery_mode="$nsx"
|
||||
[[ $Recovery_mode = false ]] && echoRgb "當前恢復模式:安裝apk不恢復數據" "0" || echoRgb "當前恢復模式:安裝apk+恢復數據" "1"
|
||||
path="/data/media/0/Android"
|
||||
path2="/data/data"
|
||||
[[ ! -d $path2 ]] && echoRgb "設備不存在user目錄" "0" && exit 1
|
||||
[[ $(which restorecon) = "" ]] && echoRgb "restorecon命令不存在" "0" && exit 1
|
||||
[[ $(which restorecon) == "" ]] && echoRgb "restorecon命令不存在" "0" && exit 1
|
||||
#記錄開始時間
|
||||
starttime1="$(date -u "+%s")"
|
||||
[[ $(pm path "com.android.vending") != "" ]] && echoRgb "注意 為了避免還原失敗請關閉PLAY的安全檢查"
|
||||
{
|
||||
Backup_folder="$MODDIR"
|
||||
if [[ ! -f $Backup_folder/app_details ]]; then
|
||||
echoRgb "$Backup_folder/app_details遺失，無法獲取包名" "0" && exit 1
|
||||
else
|
||||
. "$Backup_folder/app_details"
|
||||
fi
|
||||
name="$PackageName" ; [[ $name = "" ]] && echoRgb "包名獲取失敗" "0" && exit 2
|
||||
name2="$ChineseName" ; [[ $name2 = "" ]] && echoRgb "應用名獲取失敗" "0" && exit 2
|
||||
echoRgb "恢複$name2 ($name)"
|
||||
starttime2="$(date -u "+%s")"
|
||||
if [[ $(pm path "$name") = "" ]]; then
|
||||
apkfile="$(find "$Backup_folder" -maxdepth 1 -name "apk.*" -type f 2>/dev/null)"
|
||||
if [[ $apkfile != "" ]]; then
|
||||
rm -rf "$TMPDIR"/*
|
||||
case ${apkfile##*.} in
|
||||
lz4) pv "$apkfile" | tar -I lz4 -xmpf - -C "$TMPDIR" ;;
|
||||
zst) pv "$apkfile" | tar -I zstd -xmpf - -C "$TMPDIR" ;;
|
||||
tar) pv "$apkfile" | tar -xmpf - -C "$TMPDIR" ;;
|
||||
*) echoRgb "${apkfile##*/} 壓縮包不支持解壓縮" "0" ; Set_back
|
||||
esac
|
||||
echo_log "${apkfile##*/}解壓縮" && [[ -f $Backup_folder/nmsl.apk ]] && cp -r "$Backup_folder/nmsl.apk" "$TMPDIR"
|
||||
Backup_folder="$MODDIR"
|
||||
if [[ ! -f $Backup_folder/app_details ]]; then
|
||||
echoRgb "$Backup_folder/app_details遺失，無法獲取包名" "0" && exit 1
|
||||
else
|
||||
echoRgb "你的Apk壓縮包離家出走了，可能備份後移動過程遺失了\n -解決辦法手動安裝Apk後再執行恢復腳本" "0"
|
||||
. "$Backup_folder/app_details"
|
||||
fi
|
||||
if [[ $result = 0 ]]; then
|
||||
case $(find "$TMPDIR" -maxdepth 1 -name "*.apk" -type f 2>/dev/null | wc -l) in
|
||||
1)
|
||||
echoRgb "恢復普通apk"
|
||||
pm install -i com.android.vending --user 0 -r "$TMPDIR"/*.apk >/dev/null 2>&1
|
||||
echo_log "Apk安裝"
|
||||
;;
|
||||
0)
|
||||
echoRgb "$TMPDIR中沒有apk" "0"
|
||||
;;
|
||||
*)
|
||||
echoRgb "恢復split apk"
|
||||
b="$(pm install-create -i com.android.vending --user 0 | grep -Eo '[0-9]+')"
|
||||
if [[ -f $TMPDIR/nmsl.apk ]]; then
|
||||
pm install --user 0 -r "$TMPDIR/nmsl.apk" >/dev/null 2>&1
|
||||
echo_log "nmsl.apk安裝"
|
||||
fi
|
||||
find "$TMPDIR" -maxdepth 1 -name "*.apk" -type f | grep -v 'nmsl.apk' | while read; do
|
||||
pm install-write "$b" "${REPLY##*/}" "$REPLY" >/dev/null 2>&1
|
||||
echo_log "${REPLY##*/}安裝"
|
||||
done
|
||||
pm install-commit "$b" >/dev/null 2>&1
|
||||
echo_log "split Apk安裝"
|
||||
;;
|
||||
esac
|
||||
name="$PackageName"
|
||||
[[ $name == "" ]] && echoRgb "包名獲取失敗" "0" && exit 2
|
||||
name2="$ChineseName"
|
||||
[[ $name2 == "" ]] && echoRgb "應用名獲取失敗" "0" && exit 2
|
||||
echoRgb "恢複$name2 ($name)"
|
||||
starttime2="$(date -u "+%s")"
|
||||
if [[ $(pm path "$name") == "" ]]; then
|
||||
apkfile="$(find "$Backup_folder" -maxdepth 1 -name "apk.*" -type f 2>/dev/null)"
|
||||
if [[ $apkfile != "" ]]; then
|
||||
rm -rf "$TMPDIR"/*
|
||||
case ${apkfile##*.} in
|
||||
lz4) pv "$apkfile" | tar -I lz4 -xmpf - -C "$TMPDIR" ;;
|
||||
zst) pv "$apkfile" | tar -I zstd -xmpf - -C "$TMPDIR" ;;
|
||||
tar) pv "$apkfile" | tar -xmpf - -C "$TMPDIR" ;;
|
||||
*)
|
||||
echoRgb "${apkfile##*/} 壓縮包不支持解壓縮" "0"
|
||||
Set_back
|
||||
;;
|
||||
esac
|
||||
echo_log "${apkfile##*/}解壓縮" && [[ -f $Backup_folder/nmsl.apk ]] && cp -r "$Backup_folder/nmsl.apk" "$TMPDIR"
|
||||
else
|
||||
echoRgb "你的Apk壓縮包離家出走了，可能備份後移動過程遺失了\n -解決辦法手動安裝Apk後再執行恢復腳本" "0"
|
||||
fi
|
||||
if [[ $result == 0 ]]; then
|
||||
case $(find "$TMPDIR" -maxdepth 1 -name "*.apk" -type f 2>/dev/null | wc -l) in
|
||||
1)
|
||||
echoRgb "恢復普通apk"
|
||||
pm install -i com.android.vending --user 0 -r "$TMPDIR"/*.apk >/dev/null 2>&1
|
||||
echo_log "Apk安裝"
|
||||
;;
|
||||
0)
|
||||
echoRgb "$TMPDIR中沒有apk" "0"
|
||||
;;
|
||||
*)
|
||||
echoRgb "恢復split apk"
|
||||
b="$(pm install-create -i com.android.vending --user 0 | grep -Eo '[0-9]+')"
|
||||
if [[ -f $TMPDIR/nmsl.apk ]]; then
|
||||
pm install --user 0 -r "$TMPDIR/nmsl.apk" >/dev/null 2>&1
|
||||
echo_log "nmsl.apk安裝"
|
||||
fi
|
||||
find "$TMPDIR" -maxdepth 1 -name "*.apk" -type f | grep -v 'nmsl.apk' | while read; do
|
||||
pm install-write "$b" "${REPLY##*/}" "$REPLY" >/dev/null 2>&1
|
||||
echo_log "${REPLY##*/}安裝"
|
||||
done
|
||||
pm install-commit "$b" >/dev/null 2>&1
|
||||
echo_log "split Apk安裝"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
else
|
||||
echoRgb "存在當前系統中略過安裝Apk"
|
||||
fi
|
||||
else
|
||||
echoRgb "存在當前系統中略過安裝Apk"
|
||||
fi
|
||||
if [[ $Recovery_mode = true ]]; then
|
||||
if [[ $(pm path "$name") != "" ]]; then
|
||||
#停止應用
|
||||
[[ $name != $Open_apps2 ]] && am force-stop "$name"
|
||||
@@ -81,28 +81,35 @@ if [[ $Recovery_mode = true ]]; then
|
||||
FILE_NAME="${tar_path##*/}"
|
||||
FILE_NAME2="${FILE_NAME%%.*}"
|
||||
echoRgb "恢復$FILE_NAME2數據" "2"
|
||||
if [[ $FILE_NAME2 = user ]]; then
|
||||
if [[ $FILE_NAME2 == user ]]; then
|
||||
if [[ -d $X ]]; then
|
||||
case ${FILE_NAME##*.} in
|
||||
lz4) pv "$tar_path" | tar --recursive-unlink -I lz4 -xmpf - -C "$path2" ;;
|
||||
zst) pv "$tar_path" | tar --recursive-unlink -I zstd -xmpf - -C "$path2" ;;
|
||||
tar) pv "$tar_path" | tar --recursive-unlink -xmpf - -C "$path2" ;;
|
||||
*) echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0" ; Set_back
|
||||
*)
|
||||
echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
|
||||
Set_back
|
||||
;;
|
||||
esac
|
||||
else
|
||||
echoRgb "$X不存在 無法恢復$FILE_NAME2數據" "0" ; Set_back
|
||||
echoRgb "$X不存在 無法恢復$FILE_NAME2數據" "0"
|
||||
Set_back
|
||||
fi
|
||||
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
|
||||
lz4) pv "$tar_path" | tar --recursive-unlink -I lz4 -xmPpf - ;;
|
||||
zst) pv "$tar_path" | tar --recursive-unlink -I zstd -xmPpf - ;;
|
||||
tar) pv "$tar_path" | tar --recursive-unlink -xmPpf - ;;
|
||||
*) echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0" ; Set_back
|
||||
*)
|
||||
echoRgb "$FILE_NAME 壓縮包不支持解壓縮" "0"
|
||||
Set_back
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
echo_log "$FILE_NAME 解壓縮($FILE_NAME2)"
|
||||
if [[ $result = 0 ]]; then
|
||||
if [[ $result == 0 ]]; then
|
||||
case $FILE_NAME2 in
|
||||
user)
|
||||
if [[ -d $X ]]; then
|
||||
@@ -110,7 +117,8 @@ if [[ $Recovery_mode = true ]]; then
|
||||
G="$(cat "/config/sdcardfs/$name/appid")"
|
||||
else
|
||||
G="$(dumpsys package "$name" | awk '/userId=/{print $1}' | cut -f2 -d '=' | head -1)"
|
||||
fi ; G="$(echo "$G" | grep -Eo '[0-9]+')"
|
||||
fi
|
||||
G="$(echo "$G" | grep -Eo '[0-9]+')"
|
||||
if [[ $G != "" ]]; then
|
||||
echoRgb "路徑:$X"
|
||||
Path_details="$(stat -c "%A/%a %U/%G" "$X")"
|
||||
@@ -123,19 +131,21 @@ if [[ $Recovery_mode = true ]]; then
|
||||
fi
|
||||
else
|
||||
echoRgb "路徑$X不存在" "0"
|
||||
fi ;;
|
||||
data|obb)
|
||||
[[ -d $path/$FILE_NAME2/$name2 ]] && chmod -R 0777 "$path/$FILE_NAME2/$name2" ;;
|
||||
fi
|
||||
;;
|
||||
data | obb)
|
||||
[[ -d $path/$FILE_NAME2/$name2 ]] && chmod -R 0777 "$path/$FILE_NAME2/$name2"
|
||||
;;
|
||||
thanox)
|
||||
restorecon -RF "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)/" >/dev/null 2>&1
|
||||
echo_log "selinux上下文設置" && echoRgb "警告 thanox配置恢復後務必重啟\n -否則不生效" "0" ;;
|
||||
echo_log "selinux上下文設置" && echoRgb "警告 thanox配置恢復後務必重啟\n -否則不生效" "0"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
else
|
||||
echoRgb "$name2沒有安裝無法恢復數據" "0"
|
||||
fi
|
||||
fi
|
||||
endtime 1 "恢複開始到結束" && echoRgb "如發現應用閃退請重新開機" && rm -rf "$TMPDIR"/*
|
||||
rm -rf "$TMPDIR/scriptTMP"
|
||||
} &
|
||||
endtime 1 "恢複開始到結束" && echoRgb "如發現應用閃退請重新開機" && rm -rf "$TMPDIR"/*
|
||||
rm -rf "$TMPDIR/scriptTMP"
|
||||
} &
|
||||
|
||||
Reference in New Issue
Block a user