i/Hapi-Docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: remove Out-Null swallowing failures; fallback to fork when official repo has no matching Windows asset

Browse Source
This commit is contained in:
i
2026-06-02 00:24:44 +08:00
parent 9539487f1c
commit fcba4c6eef
1 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/install.ps1
+43 -9
View File
@@ -1021,10 +1021,21 @@ function Execute-Install {
Install-NodeJS -forSource "npm" Install-NodeJS -forSource "npm"
} }
$ok = $false
switch ($SELECTED_SOURCE) { switch ($SELECTED_SOURCE) {
"npm" { Install-FromNpm | Out-Null } "npm" { $ok = Install-FromNpm }
"github-official" { Install-FromGithub -repo $GITHUB_OFFICIAL_REPO | Out-Null } "github-official" {
"github-fork" { Install-FromGithub -repo $GITHUB_FORK_REPO | Out-Null } $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 Collect-Status
@@ -1067,10 +1078,21 @@ function Execute-Upgrade {
Install-NodeJS -forSource "npm" Install-NodeJS -forSource "npm"
} }
$ok = $false
switch ($script:SELECTED_SOURCE) { switch ($script:SELECTED_SOURCE) {
"npm" { Install-FromNpm | Out-Null } "npm" { $ok = Install-FromNpm }
"github-official" { Install-FromGithub -repo $GITHUB_OFFICIAL_REPO | Out-Null } "github-official" {
"github-fork" { Install-FromGithub -repo $GITHUB_FORK_REPO | Out-Null } $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 Collect-Status
@@ -1274,10 +1296,22 @@ function Run-QuickMode {
Install-NodeJS -forSource "npm" Install-NodeJS -forSource "npm"
} }
$ok = $false
switch ($script:SELECTED_SOURCE) { switch ($script:SELECTED_SOURCE) {
"npm" { Install-FromNpm | Out-Null } "npm" { $ok = Install-FromNpm }
"github-official" { Install-FromGithub -repo $GITHUB_OFFICIAL_REPO | Out-Null } "github-official" {
"github-fork" { Install-FromGithub -repo $GITHUB_FORK_REPO | Out-Null } $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) { if ($script:HAS_DOCKER -and -not $SkipHub) {