diff --git a/Getlist.sh b/Getlist.sh index dc4ad65..ae42db9 100644 --- a/Getlist.sh +++ b/Getlist.sh @@ -19,7 +19,7 @@ for launcher_app in $launcher_app; do done txtpath="$MODDIR" txtpath="${txtpath/'/storage/emulated/'/'/data/media/'}" -nametxt="$txtpath/應用列表.txt" +nametxt="$txtpath/appList.txt" [[ ! -e $nametxt ]] && echo '#不需要備份的應用請在開頭注釋# 比如#酷安 xxxxxxxx\n#不需要備份數據比如酷安! xxxxxxxx應用名後方加一個驚嘆號即可 注意是應用名不是包名' >"$nametxt" echo >>"$nametxt" echoRgb "請勿關閉腳本,等待提示結束" diff --git a/backup.sh b/backup.sh index 5aba34f..8a16020 100644 --- a/backup.sh +++ b/backup.sh @@ -31,7 +31,7 @@ i=1 #數據目錄 path="/data/media/0/Android" path2="/data/user/0" -txt="$MODDIR/應用列表.txt" +txt="$MODDIR/appList.txt" if [[ $Output_path != "" ]]; then echoRgb "使用自定義目錄\n-輸出位置:$Output_path" && Backup="$Output_path/Backup_$Compression_method" else @@ -39,9 +39,9 @@ else fi txt="${txt/'/storage/emulated/'/'/data/media/'}" PU="$(ls /dev/block/vold | grep public)" -[[ ! -f $txt ]] && echoRgb "請執行\"生成應用列表.sh\"獲取應用列表再來備份" "0" && exit 1 +[[ ! -f $txt ]] && echoRgb "請執行\"Getlist.sh\"獲取應用列表再來備份" "0" && exit 1 r="$(cat "$txt" | grep -v "#" | sed -e '/^$/d' | sed -n '$=')" -[[ $r = "" ]] && echoRgb "爬..應用列表.txt是空的或是包名被注釋了這樣備份個鬼" "0" && exit 1 +[[ $r = "" ]] && echoRgb "爬..appList.txt是空的或是包名被注釋了這樣備份個鬼" "0" && exit 1 data=/data hx="本地" echoRgb "壓縮方式:$Compression_method" @@ -76,7 +76,7 @@ fi [[ $Backup_obb_data = false ]] && echoRgb "當前backup_settings.conf的\n -Backup_obb_data為0將不備份外部數據" "0" [[ $backup_media = false ]] && echoRgb "當前backup_settings.conf的\n -backup_media為0將不備份自定義資料夾" "0" [[ ! -d $Backup ]] && mkdir -p "$Backup" -txt2="$Backup/應用列表.txt" +txt2="$Backup/appList.txt" [[ ! -f $txt2 ]] && echo "#不需要恢復還原的應用請在開頭注釋# 比如#xxxxxxxx 酷安" >"$txt2" [[ ! -d $Backup/tools ]] && cp -r "$tools_path" "$Backup" && rm -rf "$Backup/tools/bin/zip" "$Backup/tools/script" [[ ! -f $Backup/Restorebackup.sh ]] && cp -r "$script_path/restore" "$Backup/Restorebackup.sh" @@ -213,7 +213,7 @@ while [[ $i -le $r ]]; do [[ $en -ge 229 ]] && en=118 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}')" - [[ $name2 = "" ]] && echoRgb "警告! 應用列表.txt應用包名獲取失敗,可能修改有問題" "0" && exit 1 + [[ $name2 = "" ]] && echoRgb "警告! appList.txt應用包名獲取失敗,可能修改有問題" "0" && exit 1 apk_path="$(pm path "$name2" | cut -f2 -d ':')" apk_path2="$(echo "$apk_path" | head -1)" ; apk_path2="${apk_path2%/*}" if [[ -d $apk_path2 ]]; then diff --git a/tools/bin/bin.sh b/tools/bin/bin.sh index 93a941b..0cadc54 100644 --- a/tools/bin/bin.sh +++ b/tools/bin/bin.sh @@ -19,7 +19,7 @@ if [[ -d $(magisk --path 2>/dev/null) ]]; then else echo "Magisk busybox Path does not exist" fi ; export PATH="$PATH" -backup_version="V13" +backup_version="V13.1" #設置二進制命令目錄位置 [[ $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 ce1e204..f4b6b1b 100644 --- a/tools/script/restore +++ b/tools/script/restore @@ -15,7 +15,7 @@ path2="/data/data" [[ ! -d $path2 ]] && echoRgb "設備不存在user目錄" "0" && exit 1 [[ ! -d ${bin_path%/*}/apk ]] && echo "${bin_path%/*}/apk目錄遺失" && exit 1 i=1 -txt="$MODDIR/應用列表.txt" +txt="$MODDIR/appList.txt" [[ ! -f $txt ]] && echoRgb "請執行\"掃描資料夾名.sh\"獲取應用列表再來恢復" "0" && exit 2 r="$(cat "$txt" | grep -v "#" | sed -e '/^$/d' | sed -n '$=')" [[ $r = "" ]] && echoRgb "應用列表.txt包名為空或是被注釋了" "0" && exit 1