chore: consolidate dir creation and cmd running w optional sudo

femnad · Dec 26, 2023 · 238b0b4 · 238b0b4
1 parent cfaa209
commit 238b0b4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/internal/filecontent.go b/internal/filecontent.go
@@ -105,23 +105,17 @@ func chown(file, user, group string) error {
 }
 
 func ensureDir(dir string) error {
-	hasPerms, err := hasPerms(dir)
+	hasDirPerms, err := hasPerms(dir)
 	if err != nil {
 		return err
 	}
 
-	if hasPerms {
+	if hasDirPerms {
 		return os.MkdirAll(dir, 0o755)
 	}
 
-	Log.Warningf("escalating privileges to create directory %s", dir)
 	mkdirCmd := fmt.Sprintf("mkdir -p %s", dir)
-
-	isRoot, err := IsUserRoot()
-	if err != nil {
-		return err
-	}
-	return marecmd.RunNoOutput(marecmd.Input{Command: mkdirCmd, Sudo: !isRoot})
+	return MaybeRunWithSudo(mkdirCmd)
 }
 
 func getent(key, database string) (int, error) {

diff --git a/internal/run.go b/internal/run.go
@@ -1,6 +1,10 @@
 package internal
 
-import marecmd "github.com/femnad/mare/cmd"
+import (
+	"strings"
+
+	marecmd "github.com/femnad/mare/cmd"
+)
 
 func maybeWarnPasswordRequired(cmdStr string) {
 	out, _ := marecmd.Run(marecmd.Input{Command: "sudo -Nnv"})
@@ -18,7 +22,8 @@ func MaybeRunWithSudo(cmdStr string) error {
 	}
 
 	if !isRoot {
-		maybeWarnPasswordRequired(cmdStr)
+		cmdHead := strings.Split(cmdStr, "/")[0]
+		maybeWarnPasswordRequired(cmdHead)
 	}
 
 	cmd := marecmd.Input{Command: cmdStr, Sudo: !isRoot}