From 2d45b650988550ef671569502d4eba09065ef94a Mon Sep 17 00:00:00 2001 From: James Babcock Date: Sun, 30 Aug 2026 16:26:56 -0700 Subject: [PATCH] Scripts to push/pull config take arguments --- scripts/adbutil.sh | 56 +++++++++++++++++++++++++++++++++++++++++- scripts/pull_config.sh | 21 ++++++++++++++-- scripts/push_config.sh | 21 ++++++++++++++-- 3 files changed, 93 insertions(+), 5 deletions(-) diff --git a/scripts/adbutil.sh b/scripts/adbutil.sh index 5295fb4b..7b807d60 100644 --- a/scripts/adbutil.sh +++ b/scripts/adbutil.sh @@ -1,6 +1,58 @@ # Sourceable adb helper functions shared by the scripts/ utilities. # Not a standalone script; use: source "$(dirname "$0")/adbutil.sh" +# Extra arguments (e.g. -s SERIAL) inserted before every adb subcommand. +# Filled in by adbutil_parse_args; the wrapper below makes them apply to all +# plain `adb ...` calls in the sourcing script. +ADB_ARGS=() +adb() { + command adb ${ADB_ARGS[@]+"${ADB_ARGS[@]}"} "$@" +} + +# adbutil_parse_args "$@" +# +# Shared command-line parsing for the settings-port scripts. Sets: +# ADBUTIL_FILE - local settings file: a bare first argument, or the value +# of -f FILE anywhere in the argument list; empty if neither +# was given (caller applies its default) +# ADBUTIL_HELP - 1 if -h/--help appeared anywhere, else 0 +# Everything else is collected into ADB_ARGS and passed through to adb +# (e.g. -s SERIAL or -t ID to pick one of several attached devices). +adbutil_parse_args() { + ADBUTIL_FILE="" + ADBUTIL_HELP=0 + local first=1 + while [ $# -gt 0 ]; do + case "$1" in + -h|--help) + ADBUTIL_HELP=1 + ;; + -f) + if [ $# -lt 2 ]; then + echo "Error: -f requires a filename" >&2 + return 1 + fi + ADBUTIL_FILE="$2" + shift + ;; + -*) + ADB_ARGS+=("$1") + ;; + *) + # A bare first argument is the filename; later bare arguments + # are passed through (they're values for adb flags like -s). + if [ "$first" = 1 ]; then + ADBUTIL_FILE="$1" + else + ADB_ARGS+=("$1") + fi + ;; + esac + first=0 + shift + done +} + # adb_preflight # # Checks that adb exists, exactly one device is reachable, and is @@ -13,7 +65,9 @@ adb_preflight() { local package="$1" local state - if ! command -v adb >/dev/null 2>&1; then + # type -P checks PATH only, so the adb wrapper function above doesn't + # satisfy the check. + if ! type -P adb >/dev/null 2>&1; then echo "Error: adb not found on PATH" >&2 return 1 fi diff --git a/scripts/pull_config.sh b/scripts/pull_config.sh index 2bba7b0a..ca6f331b 100755 --- a/scripts/pull_config.sh +++ b/scripts/pull_config.sh @@ -1,6 +1,6 @@ #!/bin/bash # Pull faceclaw's shared preferences off the attached device. -# Usage: pull_config.sh [output-file] (default: faceclaw_settings.xml) +# Usage: pull_config.sh [output-file] [-f output-file] [adb-options...] # # Uses run-as on debuggable (dev) builds. On release builds, where run-as is # refused, falls back to the FaceclawSettingsPortReceiver broadcast, which @@ -10,9 +10,26 @@ set -euo pipefail source "$(cd "$(dirname "$0")" && pwd)/adbutil.sh" +usage() { + cat <