diff --git a/.gitignore b/.gitignore index d1baad6..1d129c2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,6 @@ # Dependency directories (remove the comment below to include it) # vendor/ -.idea \ No newline at end of file +.idea + +pikman \ No newline at end of file diff --git a/alpine/commands.go b/alpine/commands.go index 7db693a..9c654e2 100644 --- a/alpine/commands.go +++ b/alpine/commands.go @@ -1,6 +1,6 @@ package alpine -var PackageManager = "apx " +var PackageManager = "apx" var Commands = map[string]string{ "autoremove": "--apk autoremove", diff --git a/arch/commands.go b/arch/commands.go index 087972b..ca69d37 100644 --- a/arch/commands.go +++ b/arch/commands.go @@ -1,6 +1,6 @@ package arch -var PackageManager = "apx " +var PackageManager = "apx" var Commands = map[string]string{ "autoremove": "--aur autoremove", diff --git a/fedora/commands.go b/fedora/commands.go index d1a7042..e5a2004 100644 --- a/fedora/commands.go +++ b/fedora/commands.go @@ -1,6 +1,6 @@ package fedora -var PackageManager = "apx " +var PackageManager = "apx" var Commands = map[string]string{ "autoremove": "--dnf autoremove", diff --git a/flatpak/commands.go b/flatpak/commands.go index 445bc98..158dda3 100644 --- a/flatpak/commands.go +++ b/flatpak/commands.go @@ -1,6 +1,6 @@ package flatpak -var PackageManager = "flatpak " +var PackageManager = "flatpak" var Commands = map[string]string{ "install": "install", diff --git a/main.go b/main.go index e6460a1..aced825 100644 --- a/main.go +++ b/main.go @@ -247,35 +247,35 @@ func getCommand(command string, osType OSType, containerName string, packageName case Arch: cmd, ok := arch.Commands[command] if ok { - return arch.PackageManager + cmd + containerName + strings.Join(packageName, " "), nil + return fmt.Sprintf("%s %s %s %s", arch.PackageManager, cmd, containerName, strings.Join(packageName, " ")), nil } else { return "", fmt.Errorf("%s: is not a valid command for Arch", command) } case Fedora: cmd, ok := fedora.Commands[command] if ok { - return fedora.PackageManager + cmd + containerName + strings.Join(packageName, " "), nil + return fmt.Sprintf("%s %s %s %s", fedora.PackageManager, cmd, containerName, strings.Join(packageName, " ")), nil } else { return "", fmt.Errorf("%s: is not a valid command for Fedora", command) } case Flatpak: cmd, ok := flatpak.Commands[command] if ok { - return flatpak.PackageManager + cmd + strings.Join(packageName, " "), nil + return fmt.Sprintf("%s %s %s", flatpak.PackageManager, cmd, strings.Join(packageName, " ")), nil } else { return "", fmt.Errorf("%s: is not a valid command for Flatpak", command) } case Alpine: cmd, ok := alpine.Commands[command] if ok { - return alpine.PackageManager + cmd + containerName + strings.Join(packageName, " "), nil + return fmt.Sprintf("%s %s %s %s", alpine.PackageManager, cmd, containerName, strings.Join(packageName, " ")), nil } else { return "", fmt.Errorf("%s: is not a valid command for Alpine", command) } case Ubuntu: cmd, ok := ubuntu.Commands[command] if ok { - return ubuntu.PackageManager + cmd + strings.Join(packageName, " "), nil + return fmt.Sprintf("%s %s %s", ubuntu.PackageManager, cmd, strings.Join(packageName, " ")), nil } else { return "", fmt.Errorf("%s: is not a valid command for Ubuntu", command) } diff --git a/ubuntu/commands.go b/ubuntu/commands.go index dbf2cf0..fd6033d 100644 --- a/ubuntu/commands.go +++ b/ubuntu/commands.go @@ -1,6 +1,6 @@ package ubuntu -var PackageManager = "sudo -S apt " +var PackageManager = "sudo -S apt" var Commands = map[string]string{ "autoremove": "autoremove",