fix: set owner for created files

internal/dir.go

@@ -26,9 +26,16 @@ func EnsureDirExists(dir string) error {
 	}
 
 	err = os.MkdirAll(dir, 0744)
-	if os.IsPermission(err) {
-		return MaybeRunWithSudo(fmt.Sprintf("mkdir -p %s", dir))
+	if err == nil {
+		return nil
+	} else if !os.IsPermission(err) {
+		return err
+	}
+
+	err = MaybeRunWithSudo(fmt.Sprintf("mkdir -p %s", dir))
+	if err != nil {
+		return err
 	}
 
-	return err
+	return chown(dir, rootUser, rootUser)
 }

internal/filecontent.go

@@ -68,7 +68,6 @@ func chown(file, user, group string) error {
 		if isHomePath {
 			return nil
 		}
-
 		user = rootUser
 		group = rootUser
 	}

internal/run.go

@@ -1,6 +1,8 @@
 package internal
 
 import (
+	"fmt"
+	"os"
 	"strings"
 
 	marecmd "github.com/femnad/mare/cmd"
@@ -61,3 +63,17 @@ func MaybeRunWithSudoForPath(cmdStr, path string) error {
 	_, err = marecmd.RunFormatError(cmd)
 	return err
 }
+
+func Move(src, dst string) error {
+	if IsHomePath(dst) {
+		return os.Rename(src, dst)
+	}
+
+	mv := fmt.Sprintf("mv %s %s", src, dst)
+	err := MaybeRunWithSudoForPath(mv, dst)
+	if err != nil {
+		return err
+	}
+
+	return chown(src, rootUser, rootUser)
+}

main.go

@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	version = "0.31.5"
+	version = "0.31.6"
 )
 
 type args struct {

provision/ensurelines.go

@@ -147,8 +147,7 @@ func ensureLine(config entity.Config, line entity.LineInFile) error {
 		return err
 	}
 
-	mv := fmt.Sprintf("mv %s %s", tmpPath, target)
-	err = internal.MaybeRunWithSudoForPath(mv, target)
+	err = internal.Move(tmpPath, target)
 	if err != nil {
 		return fmt.Errorf("error renaming %s to %s: %v", tmpPath, target, err)
 	}