Skip to content

scripts: one-prompt release deploy that reaches wireless-debugging phones #1104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cryptskii merged 1 commit into from
Oct 2, 2026
Merged

scripts: one-prompt release deploy that reaches wireless-debugging phones #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions scripts/fast_deploy_android.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,25 @@ if [[ ! -f "$APK" ]]; then
exit 1
fi

# The Android SDK's adb, ahead of any other on PATH: two adb versions share one
# server port and reset each other's connections.
SDK_DIR="${ANDROID_HOME:-${ANDROID_SDK_ROOT:-$HOME/Library/Android/sdk}}"
if [[ -x "$SDK_DIR/platform-tools/adb" ]]; then
export PATH="$SDK_DIR/platform-tools:$PATH"
fi

# Each device is an adb selector, "-s SERIAL" or "-t TRANSPORT_ID". A device
# found by itself is addressed by its transport id: a wireless-debugging serial
# can hold a space ("adb-XXXX (2)._adb-tls-connect._tcp").
DEVICES=()
if [[ -n "${SERIALS:-}" ]]; then
# shellcheck disable=SC2206
DEVICES=($SERIALS)
for s in $SERIALS; do
DEVICES+=("-s $s")
done
else
mapfile -t DEVICES < <(adb devices | awk '/\tdevice$/{print $1}')
while read -r t; do
DEVICES+=("-t $t")
done < <(adb devices -l | grep -E '[[:space:]]device[[:space:]]' | grep -oE 'transport_id:[0-9]+' | cut -d: -f2)
fi

if [[ ${#DEVICES[@]} -eq 0 ]]; then
Expand Down Expand Up @@ -90,22 +104,24 @@ else
fi

for d in "${DEVICES[@]}"; do
echo "=== $d ==="
read -r -a sel <<<"$d"
label="$(adb "${sel[@]}" shell getprop ro.serialno 2>/dev/null | tr -d '\r\n' || true)"
echo "=== ${label:-$d} ($d) ==="
if [[ $SKIP_UNINSTALL -eq 0 ]]; then
adb -s "$d" uninstall com.dsm.wallet || true
adb "${sel[@]}" uninstall com.dsm.wallet || true
fi

adb -s "$d" install -r "$APK"
adb "${sel[@]}" install -r "$APK"

if [[ $SKIP_REVERSE -eq 0 ]]; then
for p in 8080 8081 8082 8083 8084 18443; do
adb -s "$d" reverse tcp:$p tcp:$p || echo "reverse failed for $d:$p"
adb "${sel[@]}" reverse tcp:$p tcp:$p || echo "reverse failed for ${label:-$d}:$p"
done
fi

if [[ $LOCAL_DEV -eq 1 ]]; then
# Local dev: push a localhost override so the app reaches nodes via adb reverse.
is_emu=$(adb -s "$d" shell getprop ro.kernel.qemu 2>/dev/null | tr -d '\r\n')
is_emu=$(adb "${sel[@]}" shell getprop ro.kernel.qemu 2>/dev/null | tr -d '\r\n')
if [[ "$is_emu" == "1" ]]; then
ENV_HOST="10.0.2.2"
else
Expand Down Expand Up @@ -138,20 +154,20 @@ endpoint = "http://$ENV_HOST:8083"
name = "storage-node-5"
endpoint = "http://$ENV_HOST:8084"
EOF
adb -s "$d" push "$ENV_TOML" /data/local/tmp/dsm_env_config.toml
adb -s "$d" shell run-as com.dsm.wallet mkdir -p files 2>/dev/null || true
adb -s "$d" shell run-as com.dsm.wallet cp /data/local/tmp/dsm_env_config.toml files/dsm_env_config.toml
adb "${sel[@]}" push "$ENV_TOML" /data/local/tmp/dsm_env_config.toml
adb "${sel[@]}" shell run-as com.dsm.wallet mkdir -p files 2>/dev/null || true
adb "${sel[@]}" shell run-as com.dsm.wallet cp /data/local/tmp/dsm_env_config.toml files/dsm_env_config.toml
rm -f "$ENV_TOML"
echo "[fast_deploy] Env config pushed to $d (host=$ENV_HOST)"
echo "[fast_deploy] Env config pushed to ${label:-$d} (host=$ENV_HOST)"
else
# GCP mode: remove any stale local overrides so the app uses the bundled GCP config.
adb -s "$d" shell run-as com.dsm.wallet rm -f files/dsm_env_config.override.toml 2>/dev/null || true
adb -s "$d" shell run-as com.dsm.wallet rm -f files/dsm_env_config.local.toml 2>/dev/null || true
echo "[fast_deploy] Cleared stale overrides on $d (app will use bundled GCP config)"
adb "${sel[@]}" shell run-as com.dsm.wallet rm -f files/dsm_env_config.override.toml 2>/dev/null || true
adb "${sel[@]}" shell run-as com.dsm.wallet rm -f files/dsm_env_config.local.toml 2>/dev/null || true
echo "[fast_deploy] Cleared stale overrides on ${label:-$d} (app will use bundled GCP config)"
fi

if [[ $START_APP -eq 1 ]]; then
adb -s "$d" shell am start -n com.dsm.wallet/.ui.MainActivity || echo "Failed to start on $d"
adb "${sel[@]}" shell am start -n com.dsm.wallet/.ui.MainActivity || echo "Failed to start on ${label:-$d}"
fi

done
Expand Down
168 changes: 90 additions & 78 deletions scripts/fast_deploy_android_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ set -euo pipefail

# Fast deploy for DSM Android app — RELEASE (signed) variant.
# Same as fast_deploy_android.sh but builds assembleRelease.
# Prompts for the keystore path, key alias, and signing passwords when running interactively.
# One prompt: the keystore password, checked against the keystore before Gradle
# runs. The keystore defaults to $HOME/dsm-release.p12, the key to dsm-release
# (or the keystore's only private key), the key password to the keystore password.

ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
ANDROID_DIR="$ROOT_DIR/dsm_client/android"
Expand All @@ -28,43 +30,20 @@ Options:

Environment:
DSM_KEYSTORE_PASSWORD Optional; if unset, the script prompts on an interactive TTY.
DSM_KEYSTORE_PATH Optional keystore path override; if unset, the script prompts and defaults to $HOME/dsm-release.p12.
DSM_KEY_ALIAS Optional key alias override; if unset, the script prompts and defaults to dsm-release.
DSM_KEYSTORE_PATH Optional; defaults to $HOME/dsm-release.p12.
DSM_KEY_ALIAS Optional; defaults to dsm-release, or the keystore's only private key.
DSM_KEY_PASSWORD Optional key-entry password override; defaults to the keystore password.
SERIALS="id1 id2" Space-separated adb device serials. If not set, auto-detect.
SERIALS="id1 id2" Space-separated adb device serials. If not set, every device in
'device' state is used, addressed by its adb transport id.
USAGE
}

prompt_keystore_path() {
if [[ -n "${DSM_KEYSTORE_PATH:-}" ]]; then
return 0
fi

local default_path="$HOME/dsm-release.p12"

if [[ ! -t 0 ]]; then
export DSM_KEYSTORE_PATH="$default_path"
return 0
fi

read -r -p "DSM Android keystore path [$default_path]: " DSM_KEYSTORE_PATH
DSM_KEYSTORE_PATH="${DSM_KEYSTORE_PATH:-$default_path}"
export DSM_KEYSTORE_PATH
}

prompt_key_alias() {
if [[ -n "${DSM_KEY_ALIAS:-}" ]]; then
return 0
fi

if [[ ! -t 0 ]]; then
export DSM_KEY_ALIAS="dsm-release"
return 0
resolve_keystore_path() {
export DSM_KEYSTORE_PATH="${DSM_KEYSTORE_PATH:-$HOME/dsm-release.p12}"
if [[ ! -f "$DSM_KEYSTORE_PATH" ]]; then
echo "[fast_deploy_release] ERROR: keystore not found at $DSM_KEYSTORE_PATH (set DSM_KEYSTORE_PATH)." >&2
exit 1
fi

read -r -p "DSM key alias [dsm-release]: " DSM_KEY_ALIAS
DSM_KEY_ALIAS="${DSM_KEY_ALIAS:-dsm-release}"
export DSM_KEY_ALIAS
}

prompt_keystore_password() {
Expand All @@ -78,38 +57,38 @@ prompt_keystore_password() {
exit 1
fi

local keystore_path="${DSM_KEYSTORE_PATH:-$HOME/dsm-release.p12}"
local key_alias="${DSM_KEY_ALIAS:-dsm-release}"

if [[ ! -f "$keystore_path" ]]; then
echo "[fast_deploy_release] ERROR: keystore not found at $keystore_path" >&2
exit 1
fi

read -r -s -p "DSM keystore password for $key_alias ($keystore_path): " DSM_KEYSTORE_PASSWORD
read -r -s -p "Keystore password ($DSM_KEYSTORE_PATH): " DSM_KEYSTORE_PASSWORD
echo
if [[ -z "$DSM_KEYSTORE_PASSWORD" ]]; then
echo "[fast_deploy_release] ERROR: empty keystore password." >&2
exit 1
fi
export DSM_KEYSTORE_PASSWORD
}

prompt_key_password() {
if [[ -n "${DSM_KEY_PASSWORD:-}" ]]; then
# The password opens the keystore and the key Gradle signs with is in it.
# Checked here, so a wrong password costs a prompt rather than a Gradle run.
check_keystore() {
if ! command -v keytool >/dev/null 2>&1; then
echo "[fast_deploy_release] keytool not on PATH; Gradle will check the password." >&2
export DSM_KEY_ALIAS="${DSM_KEY_ALIAS:-dsm-release}"
return 0
fi

if [[ ! -t 0 ]]; then
return 0
local listing
if ! listing="$(keytool -list -keystore "$DSM_KEYSTORE_PATH" -storepass:env DSM_KEYSTORE_PASSWORD 2>&1)"; then
echo "[fast_deploy_release] $DSM_KEYSTORE_PATH refused that password." >&2
return 1
fi

read -r -s -p "DSM key password for $DSM_KEY_ALIAS (press Enter to reuse keystore password): " DSM_KEY_PASSWORD
echo
if [[ -z "$DSM_KEY_PASSWORD" ]]; then
DSM_KEY_PASSWORD="$DSM_KEYSTORE_PASSWORD"
local keys wanted
keys="$(awk -F', ' '/PrivateKeyEntry/{print $1}' <<<"$listing")"
wanted="${DSM_KEY_ALIAS:-dsm-release}"
if grep -qxF "$wanted" <<<"$keys"; then
export DSM_KEY_ALIAS="$wanted"
elif [[ -z "${DSM_KEY_ALIAS:-}" && "$(grep -c . <<<"$keys")" -eq 1 ]]; then
export DSM_KEY_ALIAS="$keys"
else
echo "[fast_deploy_release] ERROR: no key named '$wanted' in $DSM_KEYSTORE_PATH. Its keys:" >&2
sed 's/^/ /' <<<"$keys" >&2
echo "[fast_deploy_release] Set DSM_KEY_ALIAS to one of them." >&2
exit 1
fi
export DSM_KEY_PASSWORD
echo "[fast_deploy_release] Keystore opened; signing with key '$DSM_KEY_ALIAS'."
}

while [[ $# -gt 0 ]]; do
Expand All @@ -125,10 +104,18 @@ while [[ $# -gt 0 ]]; do
done

if [[ $SKIP_BUILD -eq 0 ]]; then
prompt_keystore_path
prompt_key_alias
prompt_keystore_password
prompt_key_password
resolve_keystore_path
for attempt in 1 2 3; do
prompt_keystore_password
if check_keystore; then
break
fi
if [[ ! -t 0 || $attempt -eq 3 ]]; then
exit 1
fi
unset DSM_KEYSTORE_PASSWORD
done
export DSM_KEY_PASSWORD="${DSM_KEY_PASSWORD:-$DSM_KEYSTORE_PASSWORD}"
echo "[fast_deploy_release] Gradle assembleRelease (incremental)…"
(cd "$ANDROID_DIR" && ./gradlew --stop && ./gradlew :app:assembleRelease --no-daemon --console=plain)
fi
Expand All @@ -143,11 +130,25 @@ if [[ $BUILD_ONLY -eq 1 ]]; then
exit 0
fi

# The Android SDK's adb, ahead of any other on PATH: two adb versions share one
# server port and reset each other's connections.
SDK_DIR="${ANDROID_HOME:-${ANDROID_SDK_ROOT:-$HOME/Library/Android/sdk}}"
if [[ -x "$SDK_DIR/platform-tools/adb" ]]; then
export PATH="$SDK_DIR/platform-tools:$PATH"
fi

# Each device is an adb selector, "-s SERIAL" or "-t TRANSPORT_ID". A device
# found by itself is addressed by its transport id: a wireless-debugging serial
# can hold a space ("adb-XXXX (2)._adb-tls-connect._tcp").
DEVICES=()
if [[ -n "${SERIALS:-}" ]]; then
# shellcheck disable=SC2206
DEVICES=($SERIALS)
for s in $SERIALS; do
DEVICES+=("-s $s")
done
else
mapfile -t DEVICES < <(adb devices | awk '/\tdevice$/{print $1}')
while read -r t; do
DEVICES+=("-t $t")
done < <(adb devices -l | grep -E '[[:space:]]device[[:space:]]' | grep -oE 'transport_id:[0-9]+' | cut -d: -f2)
fi

if [[ ${#DEVICES[@]} -eq 0 ]]; then
Expand Down Expand Up @@ -176,23 +177,30 @@ else
echo "[fast_deploy_release] GCP mode: using bundled dsm_env_config.toml (the beta fleet: 5 GCP nodes)"
fi

FAILED=()
for d in "${DEVICES[@]}"; do
echo "=== $d ==="
read -r -a sel <<<"$d"
label="$(adb "${sel[@]}" shell getprop ro.serialno 2>/dev/null | tr -d '\r\n' || true)"
echo "=== ${label:-$d} ($d) ==="
if [[ $SKIP_UNINSTALL -eq 0 ]]; then
adb -s "$d" uninstall com.dsm.wallet || true
adb "${sel[@]}" uninstall com.dsm.wallet || true
fi

adb -s "$d" install -r "$APK"
if ! adb "${sel[@]}" install -r "$APK"; then
echo "[fast_deploy_release] Install FAILED on ${label:-$d}" >&2
FAILED+=("${label:-$d}")
continue
fi

if [[ $LOCAL_DEV -eq 1 ]]; then
is_emu=$(adb -s "$d" shell getprop ro.kernel.qemu 2>/dev/null | tr -d '\r\n')
is_emu=$(adb "${sel[@]}" shell getprop ro.kernel.qemu 2>/dev/null | tr -d '\r\n')
if [[ "$is_emu" == "1" ]]; then
ENV_HOST="10.0.2.2"
else
ENV_HOST="127.0.0.1"
fi
for p in 8080 8081 8082 8083 8084 18443; do
adb -s "$d" reverse tcp:$p tcp:$p || echo "reverse failed for $d:$p"
adb "${sel[@]}" reverse tcp:$p tcp:$p || echo "reverse failed for ${label:-$d}:$p"
done
ENV_TOML=$(mktemp /tmp/dsm_env_XXXXXX)
cat >"$ENV_TOML" <<EOF
Expand Down Expand Up @@ -221,23 +229,27 @@ endpoint = "http://$ENV_HOST:8083"
name = "storage-node-5"
endpoint = "http://$ENV_HOST:8084"
EOF
adb -s "$d" push "$ENV_TOML" /data/local/tmp/dsm_env_config.toml
adb -s "$d" shell run-as com.dsm.wallet mkdir -p files 2>/dev/null || true
adb -s "$d" shell run-as com.dsm.wallet cp /data/local/tmp/dsm_env_config.toml files/dsm_env_config.toml
adb "${sel[@]}" push "$ENV_TOML" /data/local/tmp/dsm_env_config.toml
adb "${sel[@]}" shell run-as com.dsm.wallet mkdir -p files 2>/dev/null || true
adb "${sel[@]}" shell run-as com.dsm.wallet cp /data/local/tmp/dsm_env_config.toml files/dsm_env_config.toml
rm -f "$ENV_TOML"
echo "[fast_deploy_release] Env config pushed to $d (host=$ENV_HOST)"
echo "[fast_deploy_release] Env config pushed to ${label:-$d} (host=$ENV_HOST)"
else
# GCP mode: remove any stale local override so the app uses the bundled GCP config.
adb -s "$d" shell run-as com.dsm.wallet rm -f files/dsm_env_config.override.toml 2>/dev/null || true
adb -s "$d" shell run-as com.dsm.wallet rm -f files/dsm_env_config.local.toml 2>/dev/null || true
echo "[fast_deploy_release] Cleared stale overrides on $d (app will use bundled GCP config)"
adb "${sel[@]}" shell run-as com.dsm.wallet rm -f files/dsm_env_config.override.toml 2>/dev/null || true
adb "${sel[@]}" shell run-as com.dsm.wallet rm -f files/dsm_env_config.local.toml 2>/dev/null || true
echo "[fast_deploy_release] Cleared stale overrides on ${label:-$d} (app will use bundled GCP config)"
fi

if [[ $START_APP -eq 1 ]]; then
adb -s "$d" shell am force-stop com.dsm.wallet 2>/dev/null || true
adb -s "$d" shell am start -n com.dsm.wallet/.ui.MainActivity || echo "Failed to start on $d"
adb "${sel[@]}" shell am force-stop com.dsm.wallet 2>/dev/null || true
adb "${sel[@]}" shell am start -n com.dsm.wallet/.ui.MainActivity || echo "Failed to start on ${label:-$d}"
fi

done

if [[ ${#FAILED[@]} -gt 0 ]]; then
echo "[fast_deploy_release] Install failed on: ${FAILED[*]}" >&2
exit 1
fi
echo "[fast_deploy_release] Done."
Loading