ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-12 21:53:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(installer): avoid before with npm release-age configs (#85491)

Browse Source 
Summary:
- The PR updates the Unix installers to avoid emitting npm `--before` when raw npm config contains `min-releas ...  records a changelog fix, and widens an internal model-catalog test helper type to accept sync auth checks.
- PR surface: Source +1, Tests +421, Docs +1, Other +150. Total +573 across 7 files.
- Reproducibility: yes. The linked report at https://github.com/openclaw/openclaw/issues/84743 gives an isolat ...  exclusivity, and current main still has the source path that can generate the conflicting `--before` flag.

Automerge notes:
- PR branch already contained follow-up commit before automerge: fix(installer): avoid before with npm release-age configs
- PR branch already contained follow-up commit before automerge: fix(clawsweeper): address review for automerge-openclaw-openclaw-8549…

Validation:
- ClawSweeper review passed for head fb0762f468.
- Required merge gates passed before the squash merge.

Prepared head SHA: fb0762f468
Review: https://github.com/openclaw/openclaw/pull/85491#issuecomment-4522229812

Co-authored-by: Andy Ye <35905412+TurboTheTurtle@users.noreply.github.com>
Co-authored-by: clawsweeper <274271284+clawsweeper[bot]@users.noreply.github.com>
Co-authored-by: clawsweeper[bot] <274271284+clawsweeper[bot]@users.noreply.github.com>
Approved-by: takhoffman
Co-authored-by: takhoffman <781889+takhoffman@users.noreply.github.com>
This commit is contained in:
Andy Ye
2026-05-24 14:18:58 -07:00
committed by GitHub
parent 3e275a53dc
commit 4742db6c31
7 changed files with 580 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/install-cli.sh
+76 -1
View File
@@ -666,6 +666,81 @@ fix_npm_prefix_if_needed() {
log "Configured npm prefix to ${target}"
}
expand_npm_config_path() {
local path="$1"
if [[ -z "$path" ]]; then
return 1
fi
case "$path" in
"\${HOME}/"*) path="${HOME:-}/${path#\$\{HOME\}/}" ;;
"\$HOME/"*) path="${HOME:-}/${path#\$HOME/}" ;;
[~]/*) path="${HOME:-}/${path#\~/}" ;;
esac
printf '%s\n' "$path"
}
npm_config_file_has_key() {
local file
file="$(expand_npm_config_path "$1")" || return 1
local key="$2"
[[ -f "$file" ]] || return 1
grep -E "^[[:space:]]*${key}[[:space:]]*=" "$file" >/dev/null 2>&1
}
npm_command_path() {
local npm_cmd="$1"
local npm_path="$npm_cmd"
if [[ "$npm_path" != */* ]]; then
npm_path="$(command -v "$npm_cmd" 2>/dev/null)" || return 1
fi
if command -v node >/dev/null 2>&1; then
node -e 'const fs = require("node:fs"); console.log(fs.realpathSync(process.argv[1]));' "$npm_path" 2>/dev/null && return 0
fi
printf '%s\n' "$npm_path"
}
npm_builtin_config_path() {
local npm_cmd="$1"
local npm_path
npm_path="$(npm_command_path "$npm_cmd")" || return 1
local npm_root
npm_root="$(cd "$(dirname "$npm_path")/.." >/dev/null 2>&1 && pwd -P)" || return 1
printf '%s\n' "${npm_root}/npmrc"
}
npm_raw_config_has_key() {
local key="$1"
local npm_cmd="${2:-npm}"
local user_config="${NPM_CONFIG_USERCONFIG:-${npm_config_userconfig:-}}"
local global_config="${NPM_CONFIG_GLOBALCONFIG:-${npm_config_globalconfig:-}}"
local prefix="${NPM_CONFIG_PREFIX:-${npm_config_prefix:-}}"
npm_config_file_has_key ".npmrc" "$key" && return 0
if [[ -n "$user_config" ]]; then
npm_config_file_has_key "$user_config" "$key" && return 0
elif [[ -n "${HOME:-}" ]]; then
npm_config_file_has_key "${HOME}/.npmrc" "$key" && return 0
fi
if [[ -n "$global_config" ]]; then
npm_config_file_has_key "$global_config" "$key" && return 0
else
local resolved_global_config=""
resolved_global_config="$(env -u NPM_CONFIG_BEFORE -u npm_config_before "$npm_cmd" config get globalconfig 2>/dev/null || true)"
if [[ -n "$resolved_global_config" && "$resolved_global_config" != "null" && "$resolved_global_config" != "undefined" ]]; then
npm_config_file_has_key "$resolved_global_config" "$key" && return 0
fi
fi
if [[ -n "$prefix" ]]; then
npm_config_file_has_key "${prefix}/etc/npmrc" "$key" && return 0
fi
local builtin_config=""
builtin_config="$(npm_builtin_config_path "$npm_cmd" 2>/dev/null || true)"
if [[ -n "$builtin_config" ]]; then
npm_config_file_has_key "$builtin_config" "$key" && return 0
fi
return 1
}
install_openclaw() {
local requested="${OPENCLAW_VERSION:-latest}"
if is_openclaw_source_package_install_spec "$requested"; then
@@ -674,7 +749,7 @@ install_openclaw() {
local freshness_flag="--min-release-age=0"
local min_release_age=""
min_release_age="$(env -u NPM_CONFIG_BEFORE -u npm_config_before "$(npm_bin)" config get min-release-age 2>/dev/null || true)"
if [[ -z "$min_release_age" || "$min_release_age" == "null" || "$min_release_age" == "undefined" ]]; then
if ! npm_raw_config_has_key "min-release-age" "$(npm_bin)" && [[ -z "$min_release_age" || "$min_release_age" == "null" || "$min_release_age" == "undefined" ]]; then
local before_value=""
before_value="$(env -u NPM_CONFIG_MIN_RELEASE_AGE -u npm_config_min_release_age -u npm_config_min-release-age "$(npm_bin)" config get before 2>/dev/null || true)"
if [[ -n "$before_value" && "$before_value" != "null" && "$before_value" != "undefined" ]]; then