Skip to content

Commit acb8fec

Browse files
YAWAsauYAWAsau
committed
bugfix
1 parent 34ff82b commit acb8fec

File tree

2 files changed

+68
-74
lines changed

2 files changed

+68
-74
lines changed

‎tools/bin/classes.dex

712 Bytes
Binary file not shown.

‎tools/bin/tools.sh

Lines changed: 68 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Compression_rate=3
77
script="${0##*/}"
88
if [[ ! -d $tools_path ]]; then
99
tools_path="${MODDIR%/*}/tools"
10-
[[ ! -d $tools_path ]] && echo "$tools_path二進製目錄遺失" && EXIT="true"
10+
[[ ! -d $tools_path ]] && echo "$tools_path二進制目錄遺失" && EXIT="true"
1111
fi
1212
bin_path="$tools_path/bin"
1313
script_path="$tools_path/script"
@@ -275,7 +275,7 @@ update_script() {
275275
if [[ $(unzip -l "$zipFile" | awk '{print $4}' | egrep -o "^backup_settings.conf$") != "" ]]; then
276276
unzip -o "$zipFile" -j "tools/bin/tools.sh" -d "$MODDIR" &>/dev/null
277277
shell_language="$(grep -o 'shell_language="[^"]*"' "$MODDIR/tools.sh" 2>/dev/null | awk -F'=' '{print $2}' | tr -d '"' | head -1)"
278-
if [[ $(expr "$(echo "$backup_version" | tr -d "a-zA-Z")" \> "$(cat "$MODDIR/tools.sh" | awk '/backup_version/{print $1}' | cut -f2 -d '=' | head -1 | sed 's/\"//g' | tr -d "a-zA-Z")") -eq 0 ]]; then
278+
if [[ $(expr "$(echo "$backup_version" | tr -d "a-zA-Z")" \> "$(awk '/backup_version/{print $1}' "$MODDIR/tools.sh" | cut -f2 -d '=' | head -1 | sed 's/\"//g' | tr -d "a-zA-Z")") -eq 0 ]]; then
279279
case $MODDIR in
280280
*Backup_*)
281281
if [[ -f $MODDIR/app_details ]]; then
@@ -355,42 +355,48 @@ update_script() {
355355
}
356356
update_script
357357
zipFile="$(ls -t /storage/emulated/0/Download/*.zip 2>/dev/null | head -1)"
358-
[[ $(unzip -l "$zipFile" 2>/dev/null | awk '{print $4}' | egrep -wo "^backup_settings.conf$") != "" ]] && update_script
358+
if [[ $(unzip -l "$zipFile" 2>/dev/null | awk '{print $4}' | egrep -wo "^backup_settings.conf$") != "" ]]; then
359+
update_script
360+
else
361+
zipFile="$(ls -t /storage/emulated/0/Android/data/com.tencent.mobileqq/Tencent/QQfile_recv/*.zip 2>/dev/null | head -1)"
362+
[[ $(unzip -l "$zipFile" 2>/dev/null | awk '{print $4}' | egrep -wo "^backup_settings.conf$") != "" ]] && update_script
363+
fi
359364
case $operate in
360365
backup|Restore|Restore2|Getlist|backup_media)
361-
user_id="$(appinfo -listUsers)"
362-
if [[ $user_id != "" && $(appinfo -listUsers | wc -l) -gt 1 ]]; then
363-
echo "$user_id" | while read ; do
364-
[[ $REPLY = 0 ]] && echoRgb "主用戶:$REPLY" "2" || echoRgb "分身用戶:$REPLY" "2"
365-
done
366-
echoRgb "設備存在多用戶,選擇操作目標用戶"
367-
if [[ $(echo "$user_id" | wc -l) = 2 ]]; then
368-
user1="$(echo "$user_id" | sed -n '1p')"
369-
user2="$(echo "$user_id" | sed -n '2p')"
370-
echoRgb "音量上選擇用戶:$user1，音量下選擇用戶:$user2" "2"
371-
Select_user="true"
372-
get_version "$user1" "$user2" && user="$branch"
373-
unset Select_user
374-
else
375-
while true ;do
376-
if [[ $option != "" ]]; then
377-
user="$option"
378-
break
379-
else
380-
echoRgb "請輸入需要操作目標分區" "1"
381-
read option
382-
fi
383-
done
366+
if [[ $user = "" ]]; then
367+
user_id="$(appinfo -listUsers)"
368+
if [[ $user_id != "" && $(appinfo -listUsers | wc -l) -gt 1 ]]; then
369+
echo "$user_id" | while read ; do
370+
[[ $REPLY = 0 ]] && echoRgb "主用戶:$REPLY" "2" || echoRgb "分身用戶:$REPLY" "2"
371+
done
372+
echoRgb "設備存在多用戶,選擇操作目標用戶"
373+
if [[ $(echo "$user_id" | wc -l) = 2 ]]; then
374+
user1="$(echo "$user_id" | sed -n '1p')"
375+
user2="$(echo "$user_id" | sed -n '2p')"
376+
echoRgb "音量上選擇用戶:$user1，音量下選擇用戶:$user2" "2"
377+
Select_user="true"
378+
get_version "$user1" "$user2" && user="$branch"
379+
unset Select_user
380+
else
381+
while true ;do
382+
if [[ $option != "" ]]; then
383+
user="$option"
384+
break
385+
else
386+
echoRgb "請輸入需要操作目標分區" "1"
387+
read option
388+
fi
389+
done
390+
fi
391+
echoRgb "當前操作為用戶$user"
392+
else
393+
user="0"
384394
fi
385-
echoRgb "當前操作為用戶$user"
386-
else
387-
user="0"
388-
fi
395+
fi
389396
path="/data/media/$user/Android"
390397
path2="/data/user/$user"
391398
[[ ! -d $path2 ]] && echoRgb "$user分區不存在，請將上方提示的用戶id按照需求填入\n -$MODDIR_NAME/backup_settings.conf配置項user=,一次只能填寫一個" "0" && exit 2
392-
export USER_ID="$user"
393-
;;
399+
export USER_ID="$user" ;;
394400
esac
395401
if [[ $(getprop ro.build.version.sdk) -lt 30 ]]; then
396402
alias INSTALL="pm install --user $user -r -t &>/dev/null"
@@ -471,7 +477,6 @@ if [[ $LANG != "" ]]; then
471477
else
472478
echoRgb "獲取系統語系失敗" "0"
473479
fi
474-
dns="8.8.8.8"
475480
#效驗選填是否正確
476481
Lo="$(echo "$Lo" | sed 's/true/1/g ; s/false/0/g')"
477482
isBoolean "$Lo" "Lo" && Lo="$nsx"
@@ -488,26 +493,12 @@ if [[ $json != "" ]]; then
488493
if [[ $(expr "$(echo "$backup_version" | tr -d "a-zA-Z")" \> "$(echo "$tag" | tr -d "a-zA-Z")") -eq 0 ]]; then
489494
download="$(echo "$json" | sed -r -n 's/.*"browser_download_url": *"(.*.zip)".*/\1/p')"
490495
case $cdn in
491-
1)
492-
zip_url="http://huge.cf/download/?huge-url=$download"
493-
NJ="huge.cf"
494-
;;
495-
2)
496-
zip_url="https://ghproxy.com/$download"
497-
NJ="ghproxy.com"
498-
;;
499-
3)
500-
zip_url="https://gh.api.99988866.xyz/$download"
501-
NJ="gh.api.99988866.xyz"
502-
;;
503-
4)
504-
zip_url="https://github.lx164.workers.dev/$download"
505-
NJ="github.lx164.workers.dev"
506-
;;
507-
5)
508-
zip_url="https://shrill-pond-3e81.hunsh.workers.dev/$download"
509-
NJ="shrill-pond-3e81.hunsh.workers.dev"
510-
;;
496+
1) zip_url="http://huge.cf/download/?huge-url=$download" ;;
497+
2) zip_url="https://gh-proxy.com/$download" ;;
498+
3) zip_url="https://gh.api.99988866.xyz/$download" ;;
499+
4) zip_url="https://github.lx164.workers.dev/$download" ;;
500+
5) zip_url="https://shrill-pond-3e81.hunsh.workers.dev/$download" ;;
501+
6) zip_url="https://github.moeyy.xyz/$download" ;;
511502
esac
512503
if [[ $(expr "$(echo "$backup_version" | tr -d "a-zA-Z")" \> "$(echo "$download" | tr -d "a-zA-Z")") -eq 0 ]]; then
513504
echoRgb "發現新版本:$tag"
@@ -643,6 +634,9 @@ restore_freeze() {
643634
pm unsuspend --user "$user" "$REPLY" 2>/dev/null | sed "s/Package $name2/ -應用:$name1/g ; s/new suspended state: false/暫停狀態:解凍/g"
644635
done
645636
}
637+
get_variables() {
638+
awk "/$1/"'{print $1}' "$2" | cut -f2 -d '=' | tail -n1 | sed 's/\"//g'
639+
}
646640
Backup_apk() {
647641
#檢測apk狀態進行備份
648642
#創建APP備份文件夾
@@ -741,8 +735,8 @@ Backup_data() {
741735
obb) Size="$obbSize" ;;
742736
*)
743737
if [[ -f $app_details ]]; then
744-
Size="$(cat "$app_details" | awk "/$1Size/"'{print $1}' | cut -f2 -d '=' | tail -n1 | sed 's/\"//g')"
745-
mediapath="$(cat "$app_details" | awk "/$1mediapath/"'{print $1}' | cut -f2 -d '=' | tail -n1 | sed 's/\"//g')"
738+
Size="$(get_variables "$1Size" "$app_details")"
739+
mediapath="$(get_variables "$1mediapath" "$app_details")"
746740
fi
747741
data_path="$2"
748742
if [[ $1 != storage-isolation && $1 != thanox && $1 != adb && $1 != Pictures && $1 != DCIM ]]; then
@@ -843,19 +837,19 @@ Release_data() {
843837
fi;;
844838
data) FILE_PATH="$path/data" Size="$dataSize" Selinux_state="$(LS "$FILE_PATH" | awk 'NF>1{print $1}' | sed -e "s/system_data_file/app_data_file/g" 2>/dev/null)";;
845839
obb) FILE_PATH="$path/obb" Size="$obbSize" Selinux_state="$(LS "$FILE_PATH" | awk 'NF>1{print $1}' | sed -e "s/system_data_file/app_data_file/g" 2>/dev/null)";;
846-
thanox) FILE_PATH="/data/system" Size="$(cat "$app_details" | awk "/${FILE_NAME2}Size/"'{print $1}' | cut -f2 -d '=' | tail -n1 | sed 's/\"//g')" && find "/data/system" -name "thanos*" -maxdepth 1 -type d -exec rm -rf {} \; 2>/dev/null ;;
847-
storage-isolation) FILE_PATH="/data/adb" Size="$(cat "$app_details" | awk "/${FILE_NAME2}Size/"'{print $1}' | cut -f2 -d '=' | tail -n1 | sed 's/\"//g')" ;;
840+
thanox) FILE_PATH="/data/system" Size="$(get_variables "${FILE_NAME2}Size" "$app_details")" && find "/data/system" -name "thanos*" -maxdepth 1 -type d -exec rm -rf {} \; 2>/dev/null ;;
841+
storage-isolation) FILE_PATH="/data/adb" Size="$(get_variables "${FILE_NAME2}Size" "$app_details")" ;;
848842
*)
849843
if [[ $A != "" ]]; then
850844
if [[ ${MODDIR_NAME##*/} = Media ]]; then
851-
FILE_PATH="$(cat "$app_details" | awk "/${FILE_NAME2}mediapath/"'{print $1}' | cut -f2 -d '=' | tail -n1 | sed 's/\"//g')"
845+
FILE_PATH="$(get_variables "${FILE_NAME2}mediapath" "$app_details")"
852846
if [[ $FILE_PATH = "" ]]; then
853847
echoRgb "路徑獲取失敗" "0"
854848
else
855849
echoRgb "解壓路徑↓\n -$FILE_PATH" "2"
856850
TMPPATH="$FILE_PATH"
857851
FILE_PATH="${FILE_PATH%/*}"
858-
Size="$(cat "$app_details" | awk "/${FILE_NAME2}Size/"'{print $1}' | cut -f2 -d '=' | tail -n1 | sed 's/\"//g')"
852+
Size="$(get_variables "${FILE_NAME2}Size" "$app_details")"
859853
[[ ! -d $FILE_PATH ]] && mkdir -p "$FILE_PATH"
860854
fi
861855
fi
@@ -1008,7 +1002,7 @@ get_name(){
10081002
[[ $rgb_a -ge 229 ]] && rgb_a=118
10091003
unset PackageName NAME DUMPAPK ChineseName
10101004
[[ -f $Folder/app_details ]] && . "$Folder/app_details" &>/dev/null
1011-
[[ ! -f $txt ]] && echo "#不需要恢復還原的應用請在開頭註釋# 比如#xxxxxxxx 酷安" >"$txt"
1005+
[[ ! -f $txt ]] && echo "#不需要恢復還原的應用請在開頭注釋# 比如#xxxxxxxx 酷安" >"$txt"
10121006
if [[ $PackageName = "" || $ChineseName = "" ]]; then
10131007
echoRgb "${Folder##*/}包名獲取失敗，解壓縮獲取包名中..." "0"
10141008
rm -rf "$TMPDIR"/*
@@ -1051,7 +1045,7 @@ get_name(){
10511045
done
10521046
if [[ -d $MODDIR/Media ]]; then
10531047
echoRgb "存在媒體資料夾" "2"
1054-
[[ ! -f $txt2 ]] && echo "#不需要恢復的資料夾請在開頭註釋# 比如#媒體" > "$txt2"
1048+
[[ ! -f $txt2 ]] && echo "#不需要恢復的資料夾請在開頭注釋# 比如#媒體" > "$txt2"
10551049
find "$MODDIR/Media" -maxdepth 1 -name "*.tar*" -type f 2>/dev/null | while read; do
10561050
echoRgb "${REPLY##*/}" && echo "${REPLY##*/}" >> "$txt2"
10571051
done
@@ -1061,7 +1055,7 @@ get_name(){
10611055
}
10621056
self_test() {
10631057
if [[ $(dumpsys deviceidle get charging) = false && $(dumpsys battery | awk '/level/{print $2}' | egrep -o '[0-9]+') -le 15 ]]; then
1064-
echoRgb "電量$(dumpsys battery | awk '/level/{print $2}' | egrep -o '[0-9]+')%太低且未充電\n -為防止備份檔案或是恢復因低電量強製關機導致檔案損毀\n -請連接充電器後備份" "0" && exit 2
1058+
echoRgb "電量$(dumpsys battery | awk '/level/{print $2}' | egrep -o '[0-9]+')%太低且未充電\n -為防止備份檔案或是恢復因低電量強制關機導致檔案損毀\n -請連接充電器後備份" "0" && exit 2
10651059
fi
10661060
}
10671061
Validation_file() {
@@ -1140,7 +1134,7 @@ backup)
11401134
sort -u "$txt" -o "$txt" 2>/dev/null
11411135
data="$MODDIR"
11421136
hx="本地"
1143-
echoRgb "提示 腳本支持後臺壓縮 可以直接離開腳本\n -或是關閉終端也能備份 如需終止腳本\n -請執行終止腳本.sh即可停止\n -備份結束將發送toast提示語" "3"
1137+
echoRgb "腳本受到內核機制影響 息屏後io性能嚴重影響\n -請勿關閉終端或是息屏備份 如需終止腳本\n -請執行終止腳本.sh即可停止\n -備份結束將發送toast提示語" "3"
11441138
backup_path
11451139
echoRgb "配置詳細:\n -壓縮方式:$Compression_method\n -音量鍵確認:$Lo\n -Toast:$toast_info\n -更新:$update\n -已卸載應用檢查:$delete_folder\n -卸載應用默認操作(true刪除false移動):$default_behavior\n -默認使用usb:$USBdefault\n -備份外部數據:$Backup_obb_data\n -備份user數據:$Backup_user_data\n -自定義目錄備份:$backup_media"
11461140
D="1"
@@ -1173,7 +1167,7 @@ backup)
11731167
[[ ! -f $Backup/被卸載的應用/終止腳本.sh ]] && cp -r "$MODDIR/終止腳本.sh" "$Backup/被卸載的應用/終止腳本.sh"
11741168
[[ ! -f $Backup/被卸載的應用/backup_settings.conf ]] && echo "#1開啟0關閉\n\n#是否在每次執行恢復腳本時使用音量鍵詢問如下需求\n#如果是那下面兩項項設置就被忽略，改為音量鍵選擇\nLo=$Lo\n\n#備份與恢復遭遇異常或是結束後發送通知(toast與狀態欄提示)\ntoast_info=$toast_info\n\n#腳本檢測更新後進行更新?\nupdate=$update\n\n#主色\nrgb_a=$rgb_a\n#輔色\nrgb_b=$rgb_b\nrgb_c=$rgb_c">"$Backup/backup_settings.conf" && echo "$(sed 's/true/1/g ; s/false/0/g' "$Backup/backup_settings.conf")">"$Backup/被卸載的應用/backup_settings.conf" && echo "$(sed 's/true/1/g ; s/false/0/g' "$Backup/backup_settings.conf")">"$Backup/被卸載的應用/backup_settings.conf"
11751169
txt2="$Backup/被卸載的應用/appList.txt"
1176-
[[ ! -f $txt2 ]] && echo "#不需要恢復還原的應用請在開頭註釋# 比如#xxxxxxxx 酷安">"$txt2"
1170+
[[ ! -f $txt2 ]] && echo "#不需要恢復還原的應用請在開頭注釋# 比如#xxxxxxxx 酷安">"$txt2"
11771171
echo "${REPLY##*/} $PackageName">>"$txt2"
11781172
echo "$(sed -e "s/${REPLY##*/} $PackageName//g ; /^$/d" "$Backup/appList.txt")" >"$Backup/appList.txt"
11791173
echoRgb "${REPLY##*/}不存在系統 已移動到$Backup/被卸載的應用" "0"
@@ -1188,7 +1182,7 @@ backup)
11881182
name1="$(grep -v "#" "$txt" | sed -e '/^$/d' | sed -n "${D}p" | awk '{print $1}')"
11891183
name2="$(grep -v "#" "$txt" | sed -e '/^$/d' | sed -n "${D}p" | awk '{print $2}')"
11901184
if [[ $(echo "$Apk_info" | egrep -w "^$name2$") != "" ]]; then
1191-
[[ ! -f $Tmplist ]] && echo '#不需要備份的應用請在開頭註釋# 比如#酷安 xxxxxxxx\n#不需要備份數據比如!酷安 xxxxxxxx應用名前方方加一個驚嘆號即可 註意是應用名不是包名' >"$Tmplist"
1185+
[[ ! -f $Tmplist ]] && echo '#不需要備份的應用請在開頭注釋# 比如#酷安 xxxxxxxx\n#不需要備份數據比如!酷安 xxxxxxxx應用名前方方加一個驚嘆號即可 注意是應用名不是包名' >"$Tmplist"
11921186
echo "$name1 $name2">>"$Tmplist"
11931187
else
11941188
echoRgb "$name1 $name2不存在系統，從列表中刪除" "0"
@@ -1198,13 +1192,13 @@ backup)
11981192
[[ -f $Tmplist ]] && sed -e '/^$/d' "$Tmplist" | sort>"$txt" && rm -rf "$Tmplist"
11991193
r="$(grep -v "#" "$txt" | sed -e '/^$/d' | sed -n '$=')"
12001194
[[ $1 != "" ]] && r=1
1201-
[[ $r = "" ]] && echoRgb "$MODDIR_NAME/appList.txt是空的或是包名被註釋備份個鬼\n -檢查是否註釋亦或者執行$MODDIR_NAME/生成應用列表.sh" "0" && exit 1
1195+
[[ $r = "" ]] && echoRgb "$MODDIR_NAME/appList.txt是空的或是包名被注釋備份個鬼\n -檢查是否注釋亦或者執行$MODDIR_NAME/生成應用列表.sh" "0" && exit 1
12021196
[[ $Backup_user_data = false ]] && echoRgb "當前$MODDIR_NAME/backup_settings.conf的\n -Backup_user_data=0將不備份user數據" "0"
12031197
[[ $Backup_obb_data = false ]] && echoRgb "當前$MODDIR_NAME/backup_settings.conf的\n -Backup_obb_data=0將不備份外部數據" "0"
12041198
[[ $backup_media = false ]] && echoRgb "當前$MODDIR_NAME/backup_settings.conf的\n -backup_media=0將不備份自定義資料夾" "0"
12051199
[[ ! -d $Backup ]] && mkdir -p "$Backup"
12061200
txt2="$Backup/appList.txt"
1207-
[[ ! -f $txt2 ]] && echo "#不需要恢復還原的應用請在開頭註釋# 比如#xxxxxxxx 酷安">"$txt2"
1201+
[[ ! -f $txt2 ]] && echo "#不需要恢復還原的應用請在開頭注釋# 比如#xxxxxxxx 酷安">"$txt2"
12081202
[[ ! -d $Backup/tools ]] && cp -r "$tools_path" "$Backup" && rm -rf "$Backup/tools/bin/zip" "$Backup/tools/script"
12091203
[[ ! -f $Backup/恢復備份.sh ]] && cp -r "$script_path/restore" "$Backup/恢復備份.sh"
12101204
[[ ! -f $Backup/終止腳本.sh ]] && cp -r "$MODDIR/終止腳本.sh" "$Backup/終止腳本.sh"
@@ -1335,7 +1329,7 @@ backup)
13351329
app_details="$Backup_folder/app_details"
13361330
[[ -f $app_details ]] && . "$app_details" &>/dev/null || touch "$app_details"
13371331
mediatxt="$Backup/mediaList.txt"
1338-
[[ ! -f $mediatxt ]] && echo "#不需要恢復的資料夾請在開頭註釋# 比如#媒體" > "$mediatxt"
1332+
[[ ! -f $mediatxt ]] && echo "#不需要恢復的資料夾請在開頭注釋# 比如#媒體" > "$mediatxt"
13391333
echo "$Custom_path" | grep -v "#" | sed -e '/^$/d' | while read; do
13401334
echoRgb "備份第$A/$B個資料夾 剩下$((B - A))個" "3"
13411335
starttime2="$(date -u "+%s")"
@@ -1402,7 +1396,7 @@ Restore)
14021396
[[ ! -f $txt ]] && echoRgb "請執行\"重新生成應用列表.sh\"獲取應用列表再來恢復" "0" && exit 2
14031397
sort -u "$txt" -o "$txt" 2>/dev/null
14041398
r="$(grep -v "#" "$txt" | sed -e '/^$/d' | sed -n '$=')"
1405-
[[ $r = "" ]] && echoRgb "appList.txt包名為空或是被註釋了\n -請執行\"重新生成應用列表.sh\"獲取應用列表再來恢復" "0" && exit 1
1399+
[[ $r = "" ]] && echoRgb "appList.txt包名為空或是被注釋了\n -請執行\"重新生成應用列表.sh\"獲取應用列表再來恢復" "0" && exit 1
14061400
Backup_folder2="$MODDIR/Media"
14071401
Backup_folder3="$MODDIR/modules"
14081402
#效驗選填是否正確
@@ -1510,7 +1504,7 @@ Restore)
15101504
sort -u "$txt" -o "$txt" 2>/dev/null
15111505
A=1
15121506
B="$(grep -v "#" "$txt" 2>/dev/null | sed -e '/^$/d' | sed -n '$=')"
1513-
[[ $B = "" ]] && echoRgb "mediaList.txt壓縮包名為空或是被註釋了\n -請執行\"重新生成應用列表.sh\"獲取列表再來恢復" "0" && B=0
1507+
[[ $B = "" ]] && echoRgb "mediaList.txt壓縮包名為空或是被注釋了\n -請執行\"重新生成應用列表.sh\"獲取列表再來恢復" "0" && B=0
15141508
while [[ $A -le $B ]]; do
15151509
name1="$(grep -v "#" "$txt" | sed -e '/^$/d' | sed -n "${A}p" | awk '{print $1}')"
15161510
starttime2="$(date -u "+%s")"
@@ -1619,7 +1613,7 @@ Restore3)
16191613
starttime1="$(date -u "+%s")"
16201614
A=1
16211615
B="$(grep -v "#" "$txt" | sed -e '/^$/d' | sed -n '$=')"
1622-
[[ $B = "" ]] && echoRgb "mediaList.txt壓縮包名為空或是被註釋了\n -請執行\"重新生成應用列表.sh\"獲取列表再來恢復" "0" && exit 1
1616+
[[ $B = "" ]] && echoRgb "mediaList.txt壓縮包名為空或是被注釋了\n -請執行\"重新生成應用列表.sh\"獲取列表再來恢復" "0" && exit 1
16231617
echo "$script">"$TMPDIR/scriptTMP"
16241618
{
16251619
while [[ $A -le $B ]]; do
@@ -1644,7 +1638,7 @@ Getlist)
16441638
[[ $debug_list = true ]] && txtpath="${txtpath/'/storage/emulated/'/'/data/media/'}"
16451639
nametxt="$txtpath/appList.txt"
16461640
Tmplist="$txtpath/o"
1647-
[[ ! -e $nametxt ]] && echo '#不需要備份的應用請在開頭註釋# 比如#酷安 xxxxxxxx\n#不需要備份數據比如!酷安 xxxxxxxx應用名前方方加一個驚嘆號即可 註意是應用名不是包名' >"$nametxt"
1641+
[[ ! -e $nametxt ]] && echo '#不需要備份的應用請在開頭注釋# 比如#酷安 xxxxxxxx\n#不需要備份數據比如!酷安 xxxxxxxx應用名前方方加一個驚嘆號即可 注意是應用名不是包名' >"$nametxt"
16481642
echoRgb "請勿關閉腳本，等待提示結束"
16491643
rgb_a=118
16501644
rm -rf "$MODDIR/tmp"
@@ -1716,7 +1710,7 @@ Getlist)
17161710
name1="$(grep -v "#" "$nametxt" | sed -e '/^$/d' | sed -n "${D}p" | awk '{print $1}')"
17171711
name2="$(grep -v "#" "$nametxt" | sed -e '/^$/d' | sed -n "${D}p" | awk '{print $2}')"
17181712
if [[ $(echo "$Apk_info2" | egrep -w "^$name2$") != "" ]]; then
1719-
[[ ! -f $Tmplist ]] && echo '#不需要備份的應用請在開頭註釋# 比如#酷安 xxxxxxxx\n#不需要備份數據比如!酷安 xxxxxxxx應用名前方方加一個驚嘆號即可 註意是應用名不是包名' >"$Tmplist"
1713+
[[ ! -f $Tmplist ]] && echo '#不需要備份的應用請在開頭注釋# 比如#酷安 xxxxxxxx\n#不需要備份數據比如!酷安 xxxxxxxx應用名前方方加一個驚嘆號即可 注意是應用名不是包名' >"$Tmplist"
17201714
echo "$name1 $name2">>"$Tmplist"
17211715
else
17221716
echoRgb "$name1 $name2不存在系統，從列表中刪除" "0"
@@ -1751,7 +1745,7 @@ backup_media)
17511745
filesize="$(du -s "$Backup_folder" | awk '{print $1}')"
17521746
[[ -f $app_details ]] && . "$app_details" &>/dev/null || touch "$app_details"
17531747
mediatxt="$Backup/mediaList.txt"
1754-
[[ ! -f $mediatxt ]] && echo "#不需要恢復的資料夾請在開頭註釋# 比如#媒體" > "$mediatxt"
1748+
[[ ! -f $mediatxt ]] && echo "#不需要恢復的資料夾請在開頭注釋# 比如#媒體" > "$mediatxt"
17551749
echo "$script">"$TMPDIR/scriptTMP"
17561750
{
17571751
echo "$Custom_path" | grep -v "#" | sed -e '/^$/d' | while read; do

0 commit comments

Comments
 (0)