From 2f81f7c605d9a8ba1735b940a590fa4a36719417 Mon Sep 17 00:00:00 2001
From: Arsen Musayelyan <arsen@arsenm.dev>
Date: Wed, 25 Jan 2023 16:47:22 -0800
Subject: [PATCH] Do not use root for listing installed packages

---
 manager/apk.go    | 9 +--------
 manager/apt.go    | 9 +--------
 manager/dnf.go    | 9 +--------
 manager/pacman.go | 9 +--------
 manager/yum.go    | 9 +--------
 manager/zypper.go | 9 +--------
 6 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/manager/apk.go b/manager/apk.go
index edd1303..6b68b8d 100644
--- a/manager/apk.go
+++ b/manager/apk.go
@@ -112,15 +112,8 @@ func (a *APK) UpgradeAll(opts *Opts) error {
 }
 
 func (a *APK) ListInstalled(opts *Opts) (map[string]string, error) {
-	opts = ensureOpts(opts)
 	out := map[string]string{}
-
-	var cmd *exec.Cmd
-	if opts.AsRoot {
-		cmd = exec.Command(getRootCmd(a.rootCmd), "apk", "list", "-I")
-	} else {
-		cmd = exec.Command("apk", "list", "-I")
-	}
+	cmd := exec.Command("apk", "list", "-I")
 
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
diff --git a/manager/apt.go b/manager/apt.go
index 18ba5c6..a7486d5 100644
--- a/manager/apt.go
+++ b/manager/apt.go
@@ -104,15 +104,8 @@ func (a *APT) UpgradeAll(opts *Opts) error {
 }
 
 func (a *APT) ListInstalled(opts *Opts) (map[string]string, error) {
-	opts = ensureOpts(opts)
 	out := map[string]string{}
-
-	var cmd *exec.Cmd
-	if opts.AsRoot {
-		cmd = exec.Command(getRootCmd(a.rootCmd), "dpkg-query", "-f", "${Package}\u200b${Version}\\n", "-W")
-	} else {
-		cmd = exec.Command("dpkg-query", "-f", "${Package}\u200b${Version}\\n", "-W")
-	}
+	cmd := exec.Command("dpkg-query", "-f", "${Package}\u200b${Version}\\n", "-W")
 
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
diff --git a/manager/dnf.go b/manager/dnf.go
index a619a81..a6c5ab2 100644
--- a/manager/dnf.go
+++ b/manager/dnf.go
@@ -111,15 +111,8 @@ func (d *DNF) UpgradeAll(opts *Opts) error {
 }
 
 func (d *DNF) ListInstalled(opts *Opts) (map[string]string, error) {
-	opts = ensureOpts(opts)
 	out := map[string]string{}
-
-	var cmd *exec.Cmd
-	if opts.AsRoot {
-		cmd = exec.Command(getRootCmd(d.rootCmd), "rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
-	} else {
-		cmd = exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
-	}
+	cmd := exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
 
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
diff --git a/manager/pacman.go b/manager/pacman.go
index 04e1a38..c9b478d 100644
--- a/manager/pacman.go
+++ b/manager/pacman.go
@@ -111,15 +111,8 @@ func (p *Pacman) UpgradeAll(opts *Opts) error {
 }
 
 func (p *Pacman) ListInstalled(opts *Opts) (map[string]string, error) {
-	opts = ensureOpts(opts)
 	out := map[string]string{}
-
-	var cmd *exec.Cmd
-	if opts.AsRoot {
-		cmd = exec.Command(getRootCmd(p.rootCmd), "pacman", "-Q")
-	} else {
-		cmd = exec.Command("pacman", "-Q")
-	}
+	cmd := exec.Command("pacman", "-Q")
 
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
diff --git a/manager/yum.go b/manager/yum.go
index 2408a28..65a0e74 100644
--- a/manager/yum.go
+++ b/manager/yum.go
@@ -111,15 +111,8 @@ func (y *YUM) UpgradeAll(opts *Opts) error {
 }
 
 func (y *YUM) ListInstalled(opts *Opts) (map[string]string, error) {
-	opts = ensureOpts(opts)
 	out := map[string]string{}
-
-	var cmd *exec.Cmd
-	if opts.AsRoot {
-		cmd = exec.Command(getRootCmd(y.rootCmd), "rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
-	} else {
-		cmd = exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
-	}
+	cmd := exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
 
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
diff --git a/manager/zypper.go b/manager/zypper.go
index 0588b73..9440e41 100644
--- a/manager/zypper.go
+++ b/manager/zypper.go
@@ -111,15 +111,8 @@ func (z *Zypper) UpgradeAll(opts *Opts) error {
 }
 
 func (z *Zypper) ListInstalled(opts *Opts) (map[string]string, error) {
-	opts = ensureOpts(opts)
 	out := map[string]string{}
-
-	var cmd *exec.Cmd
-	if opts.AsRoot {
-		cmd = exec.Command(getRootCmd(z.rootCmd), "rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
-	} else {
-		cmd = exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
-	}
+	cmd := exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
 
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {