From 7f1b33758e20b4186987bbfa1d7a2ca37747dc1c Mon Sep 17 00:00:00 2001 From: nekohepott Date: Wed, 17 Jun 2026 04:16:28 +0300 Subject: [PATCH] fix always getting apk packages --- src/providers/packages.go | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/providers/packages.go b/src/providers/packages.go index 1b84a6a..274de70 100644 --- a/src/providers/packages.go +++ b/src/providers/packages.go @@ -14,22 +14,6 @@ func pathExists(path string) bool { } func getPmPackages(packagerName string, packagerPath string) string { - if packagerName == "apk" { - out, err := exec.Command("apk", "info").Output() - if err != nil { - return "error reading apk package list" - } - pkgsRaw := strings.TrimSpace(string(out)) - - pkgsList := strings.Split(pkgsRaw, "\n") - pkgCount := len(pkgsList) - - if pkgsRaw == "" { - pkgCount = 0 - } - - return fmt.Sprintf("%d (apk)", pkgCount) - } if pathExists(packagerPath) { pkgs, err := os.ReadDir(packagerPath) if err != nil { @@ -38,6 +22,22 @@ func getPmPackages(packagerName string, packagerPath string) string { if packagerName == "pacman" { return strconv.Itoa(len(pkgs)-1) + " (pacman)" } + if packagerName == "apk" { + out, err := exec.Command("apk", "info").Output() + if err != nil { + return "error reading apk package list" + } + pkgsRaw := strings.TrimSpace(string(out)) + + pkgsList := strings.Split(pkgsRaw, "\n") + pkgCount := len(pkgsList) + + if pkgsRaw == "" { + pkgCount = 0 + } + + return fmt.Sprintf("%d (apk)", pkgCount) + } return strconv.Itoa(len(pkgs)) + " (" + packagerName + ")" } return "" @@ -54,7 +54,7 @@ func GetPkgs() string { getPmPackages("emerge", "/var/lib/portage"), getPmPackages("nix-user", "~/.nix-profile/lib/nix/profiles/per-user"), getPmPackages("nix", "/nix/store"), - getPmPackages("apk", ""), + getPmPackages("apk", "/etc/apk/"), } var pkgsList []string for _, p := range rawPkgs {