Skip to content

Commit c016118

Browse files
YAWAsauYAWAsau
committed
bugfix
1 parent 307db2a commit c016118

File tree

2 files changed

+25
-30
lines changed

2 files changed

+25
-30
lines changed

‎tools/soc.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎tools/tools.sh

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ MODDIR="$MODDIR"
99
MODDIR_NAME="${MODDIR##*/}"
1010
tools_path="$MODDIR/tools"
1111
script="${0##*/}"
12-
backup_version="202502272204"
12+
backup_version="202504241535"
1313
[[ $SHELL = *mt* ]] && echo "請勿使用MT管理器拓展包環境執行,請更換系統環境" && exit 2
1414
update_backup_settings_conf() {
1515
echo "#0關閉音量鍵選擇 (如選項未設置，則強制使用音量鍵選擇)
@@ -192,11 +192,11 @@ fi
192192
if [[ ! -f $conf_path ]]; then
193193
case $operate in
194194
backup_media|backup|Getlist|Restore|Restore2|check_file|convert|Restore3|dumpname)
195-
if [[ $conf_path != *Backup_* ]]; then
195+
if [[ $conf_path != *restore_settings.conf && $conf_path = *backup_settings.conf ]]; then
196196
update_backup_settings_conf>"$conf_path"
197197
echo "因腳本找不到\n$conf_path\n故重新生成默認列表\n請重新配置後重新執行腳本" && exit 0
198198
else
199-
if [[ $conf_path = *Backup_* ]]; then
199+
if [[ $conf_path = *restore_settings.conf && $conf_path != *backup_settings.conf ]]; then
200200
update_Restore_settings_conf>"$conf_path"
201201
echo "因腳本找不到\n$conf_path\n故重新生成默認列表\n請重新配置後重新執行腳本" && exit 0
202202
else
@@ -209,23 +209,16 @@ fi
209209
. "$conf_path" &>/dev/null
210210
case $operate in
211211
backup_media|backup|Getlist|Restore|Restore2|check_file|convert|Restore3|dumpname)
212-
if [[ $conf_path != *Backup_* ]]; then
212+
if [[ $conf_path != *restore_settings.conf && $conf_path = *backup_settings.conf ]]; then
213213
update_backup_settings_conf>"$conf_path"
214214
else
215-
if [[ $conf_path = *Backup_* ]]; then
215+
if [[ $conf_path = *restore_settings.conf && $conf_path != *backup_settings.conf ]]; then
216216
update_Restore_settings_conf>"$conf_path"
217217
else
218218
echo "$conf_path配置遺失" && exit 1
219219
fi
220220
fi ;;
221221
esac
222-
if [[ $Shell_LANG != "" ]]; then
223-
case $Shell_LANG in
224-
1) LANG="CN" ;;
225-
0) LANG="TW" ;;
226-
*) echo "$conf_path Shell_LANG=$Shell_LANG 設置錯誤 正確1or0" && exit 2 ;;
227-
esac
228-
fi
229222
LANG="${LANG:="$(getprop "persist.sys.locale")"}"
230223
echoRgb() {
231224
#轉換echo顏色提高可讀性
@@ -882,7 +875,7 @@ if [[ $path_hierarchy != "" && $Script_target_language != "" ]]; then
882875
done
883876
[[ -e $TMPDIR/0 ]] && rm -rf "$TMPDIR/0" && echoRgb "轉換腳本完成，退出腳本重新執行即可使用" && exit 2
884877
fi
885-
#效驗選填是否正確
878+
#校驗選填是否正確
886879
case $Lo in
887880
0)
888881
[[ $update != "" ]] && isBoolean "$update" "update" && update="$nsx" || {
@@ -902,9 +895,13 @@ case $Lo in
902895
} ;;
903896
*) echoRgb "$conf_path Lo=$Lo填寫錯誤，正確值0 1 2" "0" && exit 2 ;;
904897
esac
905-
[[ $update = true ]] && json="$(down "$Language" 2>/dev/null)" || echoRgb "自動更新被關閉" "0"
898+
if [[ $update = true ]]; then
899+
json="$(down "$Language" 2>/dev/null)"
900+
else
901+
echoRgb "自動更新被關閉" "0"
902+
fi
906903
if [[ $json != "" ]]; then
907-
tag="$(jq -r '.tag_name'<<< "$json")"
904+
tag="$(jq -r '.tag_name'<<< "$json" 2>/dev/null)"
908905
if [[ $tag != "" && $backup_version != $tag ]]; then
909906
if [[ $(expr "$(echo "$backup_version" | tr -d "a-zA-Z")" \> "$(echo "$tag" | tr -d "a-zA-Z")") -eq 0 ]]; then
910907
download="$(jq -r '.assets[].browser_download_url'<<< "$json")"
@@ -1242,11 +1239,6 @@ Backup_data() {
12421239
tar | Tar | TAR) tar --checkpoint-action="ttyout=%T\r" --exclude="Backup_"* --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/QQ" --exclude="${data_path##*/}/Telegram" --exclude="${data_path##*/}"/.* --warning=no-file-changed -cpf "$Backup_folder/$1.tar" -C "${data_path%/*}" "${data_path##*/}" ;;
12431240
zstd | Zstd | ZSTD) tar --checkpoint-action="ttyout=%T\r" --exclude="Backup_"* --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/QQ" --exclude="${data_path##*/}/Telegram" --exclude="${data_path##*/}"/.* --warning=no-file-changed -cpf - -C "${data_path%/*}" "${data_path##*/}" | zstd --ultra -3 -T0 -q --priority=rt >"$Backup_folder/$1.tar.zst" ;;
12441241
esac
1245-
else
1246-
case $Compression_method in
1247-
tar | Tar | TAR) tar --checkpoint-action="ttyout=%T\r" --exclude="Backup_"* --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/QQ" --exclude="${data_path##*/}/Telegram" --exclude="${data_path##*/}/modules" --exclude="${data_path##*/}/modules_update" --exclude="${data_path##*/}"/.* --warning=no-file-changed -cpf "$Backup_folder/$1.tar" -C "${data_path%/*}" "${data_path##*/}" ;;
1248-
zstd | Zstd | ZSTD) tar --checkpoint-action="ttyout=%T\r" --exclude="Backup_"* --exclude="${data_path##*/}/cache" --exclude="${data_path##*/}/QQ" --exclude="${data_path##*/}/Telegram" --exclude="${data_path##*/}/modules" --exclude="${data_path##*/}/modules_update" --exclude="${data_path##*/}"/.* --warning=no-file-changed -cpf - -C "${data_path%/*}" "${data_path##*/}" | zstd --ultra -3 -T0 -q --priority=rt >"$Backup_folder/$1.tar.zst" ;;
1249-
esac
12501242
fi
12511243
;;
12521244
esac
@@ -1478,7 +1470,7 @@ disable_verify() {
14781470
settings put global package_verifier_enable 0 2>/dev/null
14791471
#未知來源
14801472
settings put secure install_non_market_apps 1 2>/dev/null
1481-
#關閉play安全效驗
1473+
#關閉play安全校驗
14821474
if [[ $(settings get global package_verifier_user_consent 2>/dev/null) != -1 ]]; then
14831475
settings put global package_verifier_user_consent -1 2>/dev/null
14841476
settings put global upload_apk_enable 0 2>/dev/null
@@ -1672,12 +1664,12 @@ Validation_file() {
16721664
MODDIR_NAME="${1%/*}"
16731665
MODDIR_NAME="${MODDIR_NAME##*/}"
16741666
FILE_NAME="${1##*/}"
1675-
echoRgb "效驗$FILE_NAME"
1667+
echoRgb "校驗$FILE_NAME"
16761668
case ${FILE_NAME##*.} in
16771669
zst) zstd -t "$1" 2>/dev/null ;;
16781670
tar) tar -tf "$1" &>/dev/null ;;
16791671
esac
1680-
echo_log "效驗"
1672+
echo_log "${FILE_NAME##*.}校驗"
16811673
}
16821674
Check_archive() {
16831675
starttime1="$(date -u "+%s")"
@@ -1688,8 +1680,8 @@ Check_archive() {
16881680
r="$(find "$MODDIR" -maxdepth 2 -name "app_details.json" -type f 2>/dev/null | wc -l)"
16891681
find "$MODDIR" -maxdepth 2 -name "app_details.json" -type f 2>/dev/null | sort | while read; do
16901682
REPLY="${REPLY%/*}"
1691-
echoRgb "效驗第$i/$r個資料夾 剩下$((r - i))個" "3"
1692-
echoRgb "效驗:${REPLY##*/}"
1683+
echoRgb "校驗第$i/$r個資料夾 剩下$((r - i))個" "3"
1684+
echoRgb "校驗:${REPLY##*/}"
16931685
find "$REPLY" -maxdepth 1 -name "*.tar*" -type f 2>/dev/null | sort | while read; do
16941686
Validation_file "$REPLY"
16951687
[[ $result != 0 ]] && echo "$REPLY">>"$error_log"
@@ -1698,7 +1690,7 @@ Check_archive() {
16981690
let i++ nskg++
16991691
done
17001692
endtime 1
1701-
[[ -f $error_log ]] && echoRgb "以下為失敗的檔案\n $(cat "$error_log")" || echoRgb "恭喜~~全數效驗通過"
1693+
[[ -f $error_log ]] && echoRgb "以下為失敗的檔案\n $(cat "$error_log")" || echoRgb "恭喜~~全數校驗通過"
17021694
rm -rf "$error_log"
17031695
}
17041696
Set_screen_pause_seconds () {
@@ -1781,7 +1773,7 @@ backup)
17811773
zstd | Zstd | ZSTD | tar | Tar | TAR) ;;
17821774
*) echoRgb "$Compression_method為不支持的壓縮算法" "0" && exit 2 ;;
17831775
esac
1784-
#效驗選填是否正確
1776+
#校驗選填是否正確
17851777
case $Lo in
17861778
0)
17871779
[[ $Backup_Mode != "" ]] && isBoolean "$Backup_Mode" "Backup_Mode" && Backup_Mode="$nsx" || {
@@ -2161,6 +2153,9 @@ backup)
21612153
if [[ $ksu != ksu ]]; then
21622154
echoRgb "Magisk adb"
21632155
Backup_data "${REPLY##*/}" "$REPLY"
2156+
else
2157+
echoRgb "KernelSU adb不支持備份" "0"
2158+
Set_back_0
21642159
fi
21652160
else
21662161
Backup_data "${REPLY##*/}" "$REPLY"
@@ -2219,7 +2214,7 @@ Restore|Restore2)
22192214
[[ $r = "" ]] && echoRgb "appList.txt包名為空或是被注釋了\n -請執行\"重新生成應用列表.sh\"獲取應用列表再來恢復" "0" && exit 1
22202215
Backup_folder2="$MODDIR/Media"
22212216
Backup_folder3="$MODDIR/modules"
2222-
#效驗選填是否正確
2217+
#校驗選填是否正確
22232218
case $Lo in
22242219
0)
22252220
[[ $recovery_mode != "" ]] && isBoolean "$recovery_mode" "recovery_mode" && recovery_mode="$nsx" || {
@@ -2565,7 +2560,7 @@ Getlist)
25652560
case $MODDIR in
25662561
/storage/emulated/0/Android/* | /data/media/0/Android/* | /sdcard/Android/*) echoRgb "請勿在$MODDIR內生成列表" "0" && exit 2 ;;
25672562
esac
2568-
#效驗選填是否正確
2563+
#校驗選填是否正確
25692564
isBoolean "$debug_list" "debug_list" && debug_list="$nsx"
25702565
case $Lo in
25712566
0)

0 commit comments

Comments
 (0)