diff --git a/tools/bin/bin.sh b/tools/bin/bin.sh index 5a38317..0e465c1 100644 --- a/tools/bin/bin.sh +++ b/tools/bin/bin.sh @@ -5,15 +5,15 @@ echoRgb() { elif [[ $2 = 1 ]]; then echo -e "\e[38;5;121m -$1\e[0m" elif [[ $2 = 2 ]]; then - echo -e "\e[38;5;218m -$1\e[0m" + echo -e "\e[38;5;${rgb_c}m -$1\e[0m" elif [[ $2 = 3 ]]; then - echo -e "\e[38;5;183m -$1\e[0m" + echo -e "\e[38;5;${rgb_b}m -$1\e[0m" else - echo -e "\e[38;5;${bn}m -$1\e[0m" + echo -e "\e[38;5;${rgb_a}m -$1\e[0m" fi [[ $Status_log != "" ]] && echo " -$(date '+%T') $1" >>"$Status_log" } -bn=214 +[ "$rgb_a" = "" ] && rgb_a=214 if [ "$(whoami)" != root ]; then echoRgb "你是憨批?不給Root用你媽 爬" "0" exit 1 @@ -157,7 +157,6 @@ Print() { longToast() { content query --uri content://ice.message/long/"$*" >/dev/null 2>&1 } -bn=1 l=300 debug() { while [[ $bn -le $l ]]; do @@ -227,7 +226,6 @@ else fi Open_apps="$(appinfo -d "(" -ed ")" -o ands,pn -ta c 2>/dev/null)" Open_apps2="$(echo "$Open_apps" | cut -f2 -d '(' | sed 's/)//g')" -bn=214 raminfo="$(awk '($1 == "MemTotal:"){print $2/1000"MB"}' /proc/meminfo 2>/dev/null)" echoRgb "\n ----------------------------\n -當前腳本執行路徑:$MODDIR\n -busybox路徑:$(which busybox)\n -busybox版本:$(busybox | head -1 | awk '{print $2}')\n -appinfo版本:$(appinfo --version)\n -腳本版本:$backup_version\n -Magisk版本:$(cat "/data/adb/magisk/util_functions.sh" 2>/dev/null | grep "MAGISK_VER_CODE" | cut -f2 -d '=')\n -設備架構:$abi\n -品牌:$(getprop ro.product.brand 2>/dev/null)\n -設備代號:$(getprop ro.product.device 2>/dev/null)\n -型號:$(getprop ro.product.model 2>/dev/null)\n -RAM:$raminfo\n -閃存類型:$ROM_TYPE\n -閃存顆粒:$UFS_MODEL\n -Android版本:$(getprop ro.build.version.release 2>/dev/null) SDK:$(getprop ro.build.version.sdk 2>/dev/null)\n -終端:$Open_apps\n -By@YAWAsau\n -Support: https://jq.qq.com/?_wv=1027&k=f5clPNC3" zippath="$(find "$MODDIR" -maxdepth 1 -name "*.zip" -type f 2>/dev/null)" diff --git a/tools/bin/tools.sh b/tools/bin/tools.sh index 752231d..a69f82f 100644 --- a/tools/bin/tools.sh +++ b/tools/bin/tools.sh @@ -19,8 +19,8 @@ fi [[ $conf_path != "" ]] && conf_path="$conf_path" || conf_path="$MODDIR/backup_settings.conf" [[ ! -f $conf_path ]] && echo "backup_settings.conf配置遺失" && EXIT="true" [[ $EXIT = true ]] && exit 1 -. "$bin_path/bin.sh" . "$conf_path" +. "$bin_path/bin.sh" isBoolean "$Lo" "LO" && Lo="$nsx" if [[ $Lo = false ]]; then isBoolean "$toast_info" "toast_info" && toast_info="$nsx" @@ -620,7 +620,7 @@ backup) am start -n "$REPLY" >/dev/null 2>&1 done #回到桌面 - input keyevent 3 >/dev/null 2>&1 + #input keyevent 3 >/dev/null 2>&1 exit 0 } & wait && exit @@ -1154,7 +1154,7 @@ Getlist) [[ ! -e $nametxt ]] && echo '#不需要備份的應用請在開頭注釋# 比如#酷安 xxxxxxxx\n#不需要備份數據比如酷安! xxxxxxxx應用名後方加一個驚嘆號即可 注意是應用名不是包名' >"$nametxt" update_script echoRgb "請勿關閉腳本,等待提示結束" - bn=118 + rgb_a=118 rm -rf "$MODDIR/tmp" starttime1="$(date -u "+%s")" echoRgb "提示!因為系統自帶app(位於data分區或是可卸載預裝應用)備份恢復可能存在問題\n -所以不會輸出..但是檢測為Xposed類型包名將輸出\n -如果提示不是Xposed但他就是Xposed可能為此應用元數據不符合規範導致" "0" @@ -1168,7 +1168,7 @@ Getlist) rd="0" Q="0" echo "$Apk_info" | sed 's/\///g ; s/\://g ; s/(//g ; s/)//g ; s/\[//g ; s/\]//g ; s/\-//g ; s/!//g' | while read; do - [[ $bn -ge 229 ]] && bn=118 + [[ $rgb_a -ge 229 ]] && rgb_a=118 app_1=($REPLY $REPLY) if [[ $(cat "$nametxt" | cut -f2 -d ' ' | egrep "^${app_1[1]}$") != ${app_1[1]} ]]; then case ${app_1[1]} in @@ -1180,7 +1180,7 @@ Getlist) else if [[ $(echo "$whitelist" | egrep -w "^${app_1[1]}$") = ${app_1[1]} ]]; then echo "$REPLY" >>"$nametxt" && [[ ! -e $MODDIR/tmp ]] && touch "$MODDIR/tmp" - echoRgb "$REPLY($bn)" + echoRgb "$REPLY($rgb_a)" let i++ else echoRgb "${app_1[2]}非Xposed模塊 忽略輸出" "0" @@ -1190,7 +1190,7 @@ Getlist) ;; *) echo "$REPLY" >>"$nametxt" && [[ ! -e $MODDIR/tmp ]] && touch "$MODDIR/tmp" - echoRgb "$REPLY($bn)" + echoRgb "$REPLY($rgb_a)" let i++ ;; esac @@ -1205,7 +1205,7 @@ Getlist) fi [[ -e $MODDIR/tmp ]] && echoRgb "\n -第三方apk數量=\"$Apk_Quantity\"\n -已過濾=\"$rc\"\n -xposed=\"$rd\"\n -存在列表中=\"$Q\"\n -輸出=\"$i\"" fi - let bn++ LR++ + let rgb_a++ LR++ done if [[ -f $nametxt ]]; then D="1"