Fix CI: pnpm PATH, Obsidian arch matcher, Arch pkg names, Fedora lazygit COPR
- post.go: export PNPM_HOME+PATH before pnpm add -g so global bins install correctly in the non-interactive shell. Applied to installNpmPackage and installPlaywright (incl. browser install). - system.go: treat token-less Obsidian AppImage as x86_64 (upstream publishes "Obsidian-X.Y.Z.AppImage" with no arch suffix). - pkgmgr.go: docker-ce-rootless-extras and vagrant are AUR-only on Arch → skipOverride; pipx → python-pipx on pacman. - repos.go: new setupLazygitCoprRepo enables copr.fedorainfracloud.org/ dejan/lazygit on Fedora; wired into repoGroups so lazygit installs. - Tests: PNPM_HOME export (Linux+macOS), token-less Obsidian asset, pacman pkg overrides, COPR repo setup, updated repoGroups count. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
@@ -170,18 +170,27 @@ func installObsidian(tmp string) {
|
||||
hostTokens := archTokens[archName]
|
||||
otherTokens := archTokens[otherArch()]
|
||||
|
||||
hasAnyToken := func(n string, tokens []string) bool {
|
||||
for _, t := range tokens {
|
||||
if strings.Contains(n, t) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
matches := func(name string) bool {
|
||||
n := strings.ToLower(name)
|
||||
if !strings.HasSuffix(n, ".appimage") {
|
||||
return false
|
||||
}
|
||||
matched := false
|
||||
for _, t := range hostTokens {
|
||||
if strings.Contains(n, t) {
|
||||
matched = true
|
||||
break
|
||||
}
|
||||
// Obsidian publishes the x86_64 AppImage without an arch suffix
|
||||
// (e.g. "Obsidian-1.12.7.AppImage") and the arm64 build as
|
||||
// "Obsidian-1.12.7-arm64.AppImage". Treat a token-less AppImage as x86_64.
|
||||
if !hasAnyToken(n, hostTokens) && !hasAnyToken(n, otherTokens) {
|
||||
return archName == "x86_64"
|
||||
}
|
||||
matched := hasAnyToken(n, hostTokens)
|
||||
if !matched {
|
||||
return false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user