vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-03-12 07:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(scripts): dedupe installer CLI verification

Browse Source
This commit is contained in:
Peter Steinberger
2026-03-02 08:59:33 +00:00
parent ad8d766f65
commit 756f9c9fef
3 changed files with 58 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
scripts/docker/install-sh-common/cli-verify.sh Normal file
View File

@@ -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
}

42
scripts/docker/install-sh-nonroot/run.sh
View File

@@ -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"

39
scripts/docker/install-sh-smoke/run.sh
View File

@@ -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"