Skip to content

Fix nacos-cli installer package path #35

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
KomachiSion merged 1 commit into from
Jul 15, 2026
Merged

Fix nacos-cli installer package path #35

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
19 changes: 10 additions & 9 deletions nacos-installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ download_nacos_cli() {
local os=$2
local arch=$3
local zip_filename="nacos-cli-${version}-${os}-${arch}.zip"
local download_url="${DOWNLOAD_BASE_URL}/${zip_filename}"
local download_url="${DOWNLOAD_BASE_URL}/nacos-cli/${zip_filename}"
local cached_file="$CACHE_DIR/$zip_filename"

# Create cache directory
Expand Down Expand Up @@ -540,9 +540,6 @@ install_nacos_cli() {
return 1
;;
esac
local url="${DOWNLOAD_BASE_URL}/nacos-cli-${version}-${os}-${arch}.zip"
local zip_filename="nacos-cli-${version}-${os}-${arch}.zip"

# Download nacos-cli (with caching)
local zip_file=$(download_nacos_cli "$version" "$os" "$arch")

Expand All @@ -569,17 +566,21 @@ install_nacos_cli() {
return 1
fi

# Expected binary: nacos-cli-{version}-{os}-{arch}
local expected_binary_name="nacos-cli-${version}-${os}-${arch}"
local expected_binary_name_exe="${expected_binary_name}.exe"
# New packages contain a stable binary name; keep old names as fallback.
local expected_binary_name="nacos-cli"
local legacy_binary_name="nacos-cli-${version}-${os}-${arch}"
local legacy_binary_name_exe="${legacy_binary_name}.exe"
local binary_path
binary_path=$(find "$tmp_dir" -name "$expected_binary_name" -type f | head -1)
if [ -z "$binary_path" ]; then
binary_path=$(find "$tmp_dir" -name "$expected_binary_name_exe" -type f | head -1)
binary_path=$(find "$tmp_dir" -name "$legacy_binary_name" -type f | head -1)
fi
if [ -z "$binary_path" ]; then
binary_path=$(find "$tmp_dir" -name "$legacy_binary_name_exe" -type f | head -1)
fi

if [ -z "$binary_path" ] || [ ! -f "$binary_path" ]; then
local expected_names="$expected_binary_name (or $expected_binary_name_exe)"
local expected_names="$expected_binary_name, $legacy_binary_name, or $legacy_binary_name_exe"
print_error "Binary file not found in package. Expected: $expected_names"
print_info "Available files in package:"
find "$tmp_dir" -type f | sed 's|^| |'
Expand Down
22 changes: 17 additions & 5 deletions windows/nacos-installer.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,10 +462,18 @@ if ($isAdmin) {
function Install-NacosCli {
Write-Info "Preparing to install nacos-cli $($Global:NacosCliVersion)..."
$os = "windows"
$arch = if ([Environment]::Is64BitOperatingSystem) { "amd64" } else { "386" }
$processorArch = if ($env:PROCESSOR_ARCHITEW6432) { $env:PROCESSOR_ARCHITEW6432 } else { $env:PROCESSOR_ARCHITECTURE }
$arch = switch -Regex ($processorArch) {
"^(AMD64|X64|X86_64)$" { "amd64"; break }
"^(ARM64|AARCH64)$" { "arm64"; break }
default {
Write-ErrorMsg "Unsupported architecture for nacos-cli: $processorArch"
return $false
}
}
$zipName = "nacos-cli-$($Global:NacosCliVersion)-$os-$arch.zip"
$zipPath = Join-Path $CacheDir $zipName
$dlUrl = "$DownloadBaseUrl/$zipName"
$dlUrl = "$DownloadBaseUrl/nacos-cli/$zipName"

# Download with cache
if (Test-ZipValid $zipPath) {
Expand All @@ -487,10 +495,14 @@ function Install-NacosCli {
return $false
}

$expected = "nacos-cli-$($Global:NacosCliVersion)-$os-$arch.exe"
$binary = Get-ChildItem -Path $extractDir -Recurse -Filter $expected | Select-Object -First 1
$expected = "nacos-cli.exe"
$legacyExpected = "nacos-cli-$($Global:NacosCliVersion)-$os-$arch.exe"
$binary = Get-ChildItem -Path $extractDir -Recurse -Filter $expected | Select-Object -First 1
if (-not $binary) {
$binary = Get-ChildItem -Path $extractDir -Recurse -Filter $legacyExpected | Select-Object -First 1
}
if (-not $binary) {
Write-ErrorMsg "Binary not found in package. Expected: $expected"
Write-ErrorMsg "Binary not found in package. Expected: $expected or $legacyExpected"
Get-ChildItem -Path $extractDir -Recurse | ForEach-Object { Write-Info " $($_.FullName)" }
Remove-Item $extractDir -Recurse -Force
return $false
Expand Down
Loading