fix: remove Out-Null swallowing failures; fallback to fork when official repo has no matching Windows asset
This commit is contained in:
+43
-9
@@ -1021,10 +1021,21 @@ function Execute-Install {
|
||||
Install-NodeJS -forSource "npm"
|
||||
}
|
||||
|
||||
$ok = $false
|
||||
switch ($SELECTED_SOURCE) {
|
||||
"npm" { Install-FromNpm | Out-Null }
|
||||
"github-official" { Install-FromGithub -repo $GITHUB_OFFICIAL_REPO | Out-Null }
|
||||
"github-fork" { Install-FromGithub -repo $GITHUB_FORK_REPO | Out-Null }
|
||||
"npm" { $ok = Install-FromNpm }
|
||||
"github-official" {
|
||||
$ok = Install-FromGithub -repo $GITHUB_OFFICIAL_REPO
|
||||
if (-not $ok) {
|
||||
Write-Warn "官方仓库无匹配 asset,尝试本仓库..."
|
||||
$ok = Install-FromGithub -repo $GITHUB_FORK_REPO
|
||||
}
|
||||
}
|
||||
"github-fork" { $ok = Install-FromGithub -repo $GITHUB_FORK_REPO }
|
||||
}
|
||||
|
||||
if (-not $ok) {
|
||||
Write-Err "HAPI CLI 安装失败"
|
||||
}
|
||||
|
||||
Collect-Status
|
||||
@@ -1067,10 +1078,21 @@ function Execute-Upgrade {
|
||||
Install-NodeJS -forSource "npm"
|
||||
}
|
||||
|
||||
$ok = $false
|
||||
switch ($script:SELECTED_SOURCE) {
|
||||
"npm" { Install-FromNpm | Out-Null }
|
||||
"github-official" { Install-FromGithub -repo $GITHUB_OFFICIAL_REPO | Out-Null }
|
||||
"github-fork" { Install-FromGithub -repo $GITHUB_FORK_REPO | Out-Null }
|
||||
"npm" { $ok = Install-FromNpm }
|
||||
"github-official" {
|
||||
$ok = Install-FromGithub -repo $GITHUB_OFFICIAL_REPO
|
||||
if (-not $ok) {
|
||||
Write-Warn "官方仓库无匹配 asset,尝试本仓库..."
|
||||
$ok = Install-FromGithub -repo $GITHUB_FORK_REPO
|
||||
}
|
||||
}
|
||||
"github-fork" { $ok = Install-FromGithub -repo $GITHUB_FORK_REPO }
|
||||
}
|
||||
|
||||
if (-not $ok) {
|
||||
Write-Err "HAPI CLI 升级失败"
|
||||
}
|
||||
|
||||
Collect-Status
|
||||
@@ -1274,10 +1296,22 @@ function Run-QuickMode {
|
||||
Install-NodeJS -forSource "npm"
|
||||
}
|
||||
|
||||
$ok = $false
|
||||
switch ($script:SELECTED_SOURCE) {
|
||||
"npm" { Install-FromNpm | Out-Null }
|
||||
"github-official" { Install-FromGithub -repo $GITHUB_OFFICIAL_REPO | Out-Null }
|
||||
"github-fork" { Install-FromGithub -repo $GITHUB_FORK_REPO | Out-Null }
|
||||
"npm" { $ok = Install-FromNpm }
|
||||
"github-official" {
|
||||
$ok = Install-FromGithub -repo $GITHUB_OFFICIAL_REPO
|
||||
if (-not $ok) {
|
||||
Write-Warn "官方仓库无匹配 asset,尝试本仓库..."
|
||||
$ok = Install-FromGithub -repo $GITHUB_FORK_REPO
|
||||
}
|
||||
}
|
||||
"github-fork" { $ok = Install-FromGithub -repo $GITHUB_FORK_REPO }
|
||||
}
|
||||
|
||||
if (-not $ok) {
|
||||
Write-Err "HAPI CLI 安装失败"
|
||||
exit 1
|
||||
}
|
||||
|
||||
if ($script:HAS_DOCKER -and -not $SkipHub) {
|
||||
|
||||
Reference in New Issue
Block a user