From 756f9c9fef66cdcb0058e87f06c0996b88b0e3f1 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 2 Mar 2026 08:59:33 +0000
Subject: [PATCH] refactor(scripts): dedupe installer CLI verification

---
 .../docker/install-sh-common/cli-verify.sh    | 47 +++++++++++++++++++
 scripts/docker/install-sh-nonroot/run.sh      | 42 +++--------------
 scripts/docker/install-sh-smoke/run.sh        | 39 ++-------------
 3 files changed, 58 insertions(+), 70 deletions(-)
 create mode 100644 scripts/docker/install-sh-common/cli-verify.sh

diff --git a/scripts/docker/install-sh-common/cli-verify.sh b/scripts/docker/install-sh-common/cli-verify.sh
new file mode 100644
index 00000000000..98d08cfe4bf
--- /dev/null
+++ b/scripts/docker/install-sh-common/cli-verify.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+verify_installed_cli() {
+  local package_name="$1"
+  local expected_version="$2"
+  local cli_name="$package_name"
+  local cmd_path=""
+  local entry_path=""
+  local npm_root=""
+  local installed_version=""
+
+  cmd_path="$(command -v "$cli_name" || true)"
+  if [[ -z "$cmd_path" && -x "$HOME/.npm-global/bin/$package_name" ]]; then
+    cmd_path="$HOME/.npm-global/bin/$package_name"
+  fi
+
+  if [[ -z "$cmd_path" ]]; then
+    npm_root="$(npm root -g 2>/dev/null || true)"
+    if [[ -n "$npm_root" && -f "$npm_root/$package_name/dist/entry.js" ]]; then
+      entry_path="$npm_root/$package_name/dist/entry.js"
+    fi
+  fi
+
+  if [[ -z "$cmd_path" && -z "$entry_path" ]]; then
+    echo "ERROR: $package_name is not on PATH" >&2
+    return 1
+  fi
+
+  if [[ -n "$cmd_path" ]]; then
+    installed_version="$("$cmd_path" --version 2>/dev/null | head -n 1 | tr -d '\r')"
+  else
+    installed_version="$(node "$entry_path" --version 2>/dev/null | head -n 1 | tr -d '\r')"
+  fi
+
+  echo "cli=$cli_name installed=$installed_version expected=$expected_version"
+  if [[ "$installed_version" != "$expected_version" ]]; then
+    echo "ERROR: expected ${cli_name}@${expected_version}, got ${cli_name}@${installed_version}" >&2
+    return 1
+  fi
+
+  echo "==> Sanity: CLI runs"
+  if [[ -n "$cmd_path" ]]; then
+    "$cmd_path" --help >/dev/null
+  else
+    node "$entry_path" --help >/dev/null
+  fi
+}
diff --git a/scripts/docker/install-sh-nonroot/run.sh b/scripts/docker/install-sh-nonroot/run.sh
index e7a12cac297..787bfc8e809 100644
--- a/scripts/docker/install-sh-nonroot/run.sh
+++ b/scripts/docker/install-sh-nonroot/run.sh
@@ -4,6 +4,10 @@ set -euo pipefail
 INSTALL_URL="${OPENCLAW_INSTALL_URL:-https://openclaw.bot/install.sh}"
 DEFAULT_PACKAGE="openclaw"
 PACKAGE_NAME="${OPENCLAW_INSTALL_PACKAGE:-$DEFAULT_PACKAGE}"
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+# shellcheck source=../install-sh-common/cli-verify.sh
+source "$SCRIPT_DIR/../install-sh-common/cli-verify.sh"
 
 echo "==> Pre-flight: ensure git absent"
 if command -v git >/dev/null; then
@@ -26,41 +30,7 @@ if [[ -n "$EXPECTED_VERSION" ]]; then
 else
   LATEST_VERSION="$(npm view "$PACKAGE_NAME" version)"
 fi
-CLI_NAME="$PACKAGE_NAME"
-CMD_PATH="$(command -v "$CLI_NAME" || true)"
-if [[ -z "$CMD_PATH" && -x "$HOME/.npm-global/bin/$PACKAGE_NAME" ]]; then
-  CLI_NAME="$PACKAGE_NAME"
-  CMD_PATH="$HOME/.npm-global/bin/$PACKAGE_NAME"
-fi
-ENTRY_PATH=""
-if [[ -z "$CMD_PATH" ]]; then
-  NPM_ROOT="$(npm root -g 2>/dev/null || true)"
-  if [[ -n "$NPM_ROOT" && -f "$NPM_ROOT/$PACKAGE_NAME/dist/entry.js" ]]; then
-    ENTRY_PATH="$NPM_ROOT/$PACKAGE_NAME/dist/entry.js"
-  fi
-fi
-if [[ -z "$CMD_PATH" && -z "$ENTRY_PATH" ]]; then
-  echo "$PACKAGE_NAME is not on PATH" >&2
-  exit 1
-fi
-echo "==> Verify CLI installed: $CLI_NAME"
-if [[ -n "$CMD_PATH" ]]; then
-  INSTALLED_VERSION="$("$CMD_PATH" --version 2>/dev/null | head -n 1 | tr -d '\r')"
-else
-  INSTALLED_VERSION="$(node "$ENTRY_PATH" --version 2>/dev/null | head -n 1 | tr -d '\r')"
-fi
-
-echo "cli=$CLI_NAME installed=$INSTALLED_VERSION expected=$LATEST_VERSION"
-if [[ "$INSTALLED_VERSION" != "$LATEST_VERSION" ]]; then
-  echo "ERROR: expected ${CLI_NAME}@${LATEST_VERSION}, got ${CLI_NAME}@${INSTALLED_VERSION}" >&2
-  exit 1
-fi
-
-echo "==> Sanity: CLI runs"
-if [[ -n "$CMD_PATH" ]]; then
-  "$CMD_PATH" --help >/dev/null
-else
-  node "$ENTRY_PATH" --help >/dev/null
-fi
+echo "==> Verify CLI installed"
+verify_installed_cli "$PACKAGE_NAME" "$LATEST_VERSION"
 
 echo "OK"
diff --git a/scripts/docker/install-sh-smoke/run.sh b/scripts/docker/install-sh-smoke/run.sh
index 03702788784..81dff784722 100755
--- a/scripts/docker/install-sh-smoke/run.sh
+++ b/scripts/docker/install-sh-smoke/run.sh
@@ -6,6 +6,10 @@ SMOKE_PREVIOUS_VERSION="${OPENCLAW_INSTALL_SMOKE_PREVIOUS:-}"
 SKIP_PREVIOUS="${OPENCLAW_INSTALL_SMOKE_SKIP_PREVIOUS:-0}"
 DEFAULT_PACKAGE="openclaw"
 PACKAGE_NAME="${OPENCLAW_INSTALL_PACKAGE:-$DEFAULT_PACKAGE}"
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+# shellcheck source=../install-sh-common/cli-verify.sh
+source "$SCRIPT_DIR/../install-sh-common/cli-verify.sh"
 
 echo "==> Resolve npm versions"
 LATEST_VERSION="$(npm view "$PACKAGE_NAME" version)"
@@ -51,42 +55,9 @@ echo "==> Run official installer one-liner"
 curl -fsSL "$INSTALL_URL" | bash
 
 echo "==> Verify installed version"
-CLI_NAME="$PACKAGE_NAME"
-CMD_PATH="$(command -v "$CLI_NAME" || true)"
-if [[ -z "$CMD_PATH" && -x "$HOME/.npm-global/bin/$PACKAGE_NAME" ]]; then
-  CMD_PATH="$HOME/.npm-global/bin/$PACKAGE_NAME"
-fi
-ENTRY_PATH=""
-if [[ -z "$CMD_PATH" ]]; then
-  NPM_ROOT="$(npm root -g 2>/dev/null || true)"
-  if [[ -n "$NPM_ROOT" && -f "$NPM_ROOT/$PACKAGE_NAME/dist/entry.js" ]]; then
-    ENTRY_PATH="$NPM_ROOT/$PACKAGE_NAME/dist/entry.js"
-  fi
-fi
-if [[ -z "$CMD_PATH" && -z "$ENTRY_PATH" ]]; then
-  echo "ERROR: $PACKAGE_NAME is not on PATH" >&2
-  exit 1
-fi
 if [[ -n "${OPENCLAW_INSTALL_LATEST_OUT:-}" ]]; then
   printf "%s" "$LATEST_VERSION" > "${OPENCLAW_INSTALL_LATEST_OUT:-}"
 fi
-if [[ -n "$CMD_PATH" ]]; then
-  INSTALLED_VERSION="$("$CMD_PATH" --version 2>/dev/null | head -n 1 | tr -d '\r')"
-else
-  INSTALLED_VERSION="$(node "$ENTRY_PATH" --version 2>/dev/null | head -n 1 | tr -d '\r')"
-fi
-echo "cli=$CLI_NAME installed=$INSTALLED_VERSION expected=$LATEST_VERSION"
-
-if [[ "$INSTALLED_VERSION" != "$LATEST_VERSION" ]]; then
-  echo "ERROR: expected ${CLI_NAME}@${LATEST_VERSION}, got ${CLI_NAME}@${INSTALLED_VERSION}" >&2
-  exit 1
-fi
-
-echo "==> Sanity: CLI runs"
-if [[ -n "$CMD_PATH" ]]; then
-  "$CMD_PATH" --help >/dev/null
-else
-  node "$ENTRY_PATH" --help >/dev/null
-fi
+verify_installed_cli "$PACKAGE_NAME" "$LATEST_VERSION"
 
 echo "OK"