Ark74
/
iiab-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve args handeling and logs

This commit is contained in:
Luis Guzmán 2026-01-06 06:08:23 -06:00
parent d9061203b4
commit 53f7a97ee5
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
android/termux-setup/60_mod_ppk_checks.sh
View File

@ -185,5 +185,8 @@ self_check_android_flags() {
fi fi
fi fi
log " Tip: run --check for full details." # Avoid redundant tip when we're already in --check mode.
if [[ "${MODE:-}" != "check" && "${MODE:-}" != "all" ]]; then
log " Tip: run --check for full details."
fi
} }

39
android/termux-setup/99_main.sh
View File

@ -26,6 +26,7 @@ CHECK_PPK=""
# Modes are mutually exclusive (baseline is default) # Modes are mutually exclusive (baseline is default)
MODE="baseline" # baseline|with-adb|adb-only|connect-only|ppk-only|check|all MODE="baseline" # baseline|with-adb|adb-only|connect-only|ppk-only|check|all
MODE_SET=0 MODE_SET=0
CONNECT_PORT_FROM="" # "", "flag", "positional"
usage() { usage() {
cat <<'EOF' cat <<'EOF'
@ -93,10 +94,11 @@ self_check() {
log " adb: present" log " adb: present"
adb devices -l 2>/dev/null | sed 's/^/ /' || true adb devices -l 2>/dev/null | sed 's/^/ /' || true
local serial local serial
if serial="$(adb_pick_loopback_serial 2>/dev/null)"; then # renable in need for verbose output.
log " adb shell id (first device):" # if serial="$(adb_pick_loopback_serial 2>/dev/null)"; then
adb -s "$serial" shell id 2>/dev/null | sed 's/^/ /' || true # log " adb shell id (first device):"
fi # adb -s "$serial" shell id 2>/dev/null | sed 's/^/ /' || true
# fi
else else
warn " adb: not present" warn " adb: not present"
fi fi
@ -227,7 +229,10 @@ while [[ $# -gt 0 ]]; do
ONLY_CONNECT=1 ONLY_CONNECT=1
# Optional positional port (5 digits) # Optional positional port (5 digits)
if [[ "${2:-}" =~ ^[0-9]{5}$ ]]; then if [[ "${2:-}" =~ ^[0-9]{5}$ ]]; then
[[ -n "${CONNECT_PORT_FROM:-}" && "${CONNECT_PORT_FROM}" != "positional" ]] && \
die "CONNECT PORT specified twice (positional + --connect-port). Use only one."
CONNECT_PORT="$2" CONNECT_PORT="$2"
CONNECT_PORT_FROM="positional"
shift 2 shift 2
else else
shift shift
@ -236,7 +241,13 @@ while [[ $# -gt 0 ]]; do
--ppk-only) set_mode "ppk-only"; shift ;; --ppk-only) set_mode "ppk-only"; shift ;;
--check) set_mode "check"; shift ;; --check) set_mode "check"; shift ;;
--all) set_mode "all"; shift ;; --all) set_mode "all"; shift ;;
--connect-port) CONNECT_PORT="${2:-}"; shift 2 ;; --connect-port)
[[ -n "${CONNECT_PORT_FROM:-}" && "${CONNECT_PORT_FROM}" != "flag" ]] && \
die "CONNECT PORT specified twice (positional + --connect-port). Use only one."
CONNECT_PORT="${2:-}"
CONNECT_PORT_FROM="flag"
shift 2
;;
--timeout) TIMEOUT_SECS="${2:-180}"; shift 2 ;; --timeout) TIMEOUT_SECS="${2:-180}"; shift 2 ;;
--host) HOST="${2:-127.0.0.1}"; shift 2 ;; --host) HOST="${2:-127.0.0.1}"; shift 2 ;;
--reset-debian|--clean-debian) RESET_DEBIAN=1; shift ;; --reset-debian|--clean-debian) RESET_DEBIAN=1; shift ;;
@ -248,11 +259,29 @@ while [[ $# -gt 0 ]]; do
esac esac
done done
validate_args() {
if [[ -n "${CONNECT_PORT:-}" ]]; then
CONNECT_PORT="${CONNECT_PORT//[[:space:]]/}"
[[ "$CONNECT_PORT" =~ ^[0-9]{5}$ ]] || die "Invalid --connect-port (must be 5 digits): '$CONNECT_PORT'"
case "$MODE" in
adb-only|with-adb|connect-only|ppk-only|check|all) : ;;
baseline)
log "--connect-port requires an ADB mode."
die "Use along with: --adb-only / --with-adb / --connect-only / --check / --ppk-only / --all"
;;
*)
die "--connect-port is not valid with mode=$MODE"
;;
esac
fi
}
# ------------------------- # -------------------------
# Main flows # Main flows
# ------------------------- # -------------------------
main() { main() {
setup_logging "$@" setup_logging "$@"
validate_args
sanitize_timeout sanitize_timeout
acquire_wakelock acquire_wakelock