fix always getting apk packages
This commit is contained in:
parent
8f8e6ffdc8
commit
7f1b33758e
@ -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 {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user