From 3b1799397e21da6c14f2ba7f01e9d031529afec8 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Sun, 19 Jan 2025 13:26:48 +0100 Subject: [PATCH] fix: fix nil pointer execution if no proper packagemanager selected --- cmd/install_cmd.go | 3 ++- cmd/remove_cmd.go | 5 ++++- cmd/search_cmd.go | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cmd/install_cmd.go b/cmd/install_cmd.go index ed36c43..6b8deaa 100644 --- a/cmd/install_cmd.go +++ b/cmd/install_cmd.go @@ -28,7 +28,7 @@ var installCmd = &cobra.Command{ if err := osManager.Install([]string{packageName}); err != nil { log.Printf("error: %v\n", err) } - case "homebrew": + case "homebrew", "brew": manager = &pm.HomebrewManager{} case "cargo": manager = &pm.CargoManager{} @@ -38,6 +38,7 @@ var installCmd = &cobra.Command{ manager = &pm.FlatpakManager{} default: fmt.Println("No PackageManager found") + return } if err := manager.InstallPackage(packageName); err != nil { log.Printf("error: %v\n", err) diff --git a/cmd/remove_cmd.go b/cmd/remove_cmd.go index 7e36cc6..defd1b5 100644 --- a/cmd/remove_cmd.go +++ b/cmd/remove_cmd.go @@ -1,6 +1,7 @@ package cmd import ( + "fmt" "log" "system_setup_tool/utils" @@ -27,7 +28,7 @@ var removeCmd = &cobra.Command{ if err := osManager.Install([]string{packageName}); err != nil { log.Printf("error: %v\n", err) } - case "homebrew": + case "homebrew", "brew": manager = &pm.HomebrewManager{} case "cargo": manager = &pm.CargoManager{} @@ -36,6 +37,8 @@ var removeCmd = &cobra.Command{ case "flatpak": manager = &pm.FlatpakManager{} default: + fmt.Println("No PackageManager found") + return } if err := manager.RemovePackage(packageName); err != nil { log.Printf("error: %v\n", err) diff --git a/cmd/search_cmd.go b/cmd/search_cmd.go index 1bc77bc..2536fea 100644 --- a/cmd/search_cmd.go +++ b/cmd/search_cmd.go @@ -27,6 +27,9 @@ var searchCmd = &cobra.Command{ } if managerName != "" { + if managerName == "brew" { + managerName = "homebrew" + } for _, m := range managers { if strings.EqualFold(m.Name(), managerName) { searchAndDisplayResults(m, packageName)