Fix owner issues

.github/workflows/test.yml

@@ -19,4 +19,4 @@ jobs:
         go-version: 'stable'
 
     - name: Run Go tests
-      run: go test -v ./cmd/...
+      run: go test -v ./...

README.md

@@ -52,7 +52,3 @@ func main() {
     }
 }
 ```
-
-### Build Flags
-
-The nodevfiles build tag removes support for device files.

cmd/build.go

@@ -2,14 +2,8 @@ package cmd
 
 import (
 	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"slices"
-	"strings"
 
 	"github.com/linux-immutability-tools/EtcBuilder/core"
-	"github.com/linux-immutability-tools/EtcBuilder/settings"
 	"github.com/spf13/cobra"
 )
 
@@ -55,136 +49,11 @@ func buildCommand(_ *cobra.Command, args []string) error {
 }
 
 func ExtBuildCommand(oldSys, newSys, oldUser, newUser string) error {
-	err := settings.GatherConfigFiles()
-	if err != nil {
-		return err
-	}
-
-	err = clearDirectory(newUser)
-	if err != nil {
-		return err
-	}
-
-	err = filepath.Walk(oldUser, func(userPath string, userInfo os.FileInfo, e error) error {
-		userPathRel := strings.TrimPrefix(userPath, oldUser)
-		userPathRel = strings.TrimPrefix(userPathRel, "/")
-
-		if userInfo.IsDir() {
-			newUserDirAbs := filepath.Join(newUser, userPathRel)
-			err := os.MkdirAll(newUserDirAbs, 0o755)
-			if err != nil {
-				return err
-			}
-			err = os.Chmod(newUserDirAbs, userInfo.Mode().Perm())
-			return err
-		}
-
-		err = copyUserFile(userPathRel, oldSys, newSys, oldUser, newUser, userInfo)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
 
+	err := core.BuildNewEtc(oldSys, oldUser, newSys, newUser)
 	if err != nil {
 		return err
 	}
 
 	return nil
 }
-
-func copyUserFile(relUserFile, oldSysDir, newSysDir, oldUserDir, newUserDir string, oldFileInfo os.FileInfo) error {
-	userFileType := oldFileInfo.Mode().Type().String()
-
-	absUserFileOld := filepath.Join(oldUserDir, relUserFile)
-	absUserFileNew := filepath.Join(newUserDir, relUserFile)
-
-	os.MkdirAll(filepath.Dir(absUserFileNew), 0o755)
-
-	for _, externalFileHandler := range ExternalFileHandlers {
-		if !externalFileHandler.IsFileSupported(absUserFileOld) {
-			continue
-		}
-		return externalFileHandler.Handle(relUserFile, oldSysDir, newSysDir, oldUserDir, newUserDir)
-	}
-
-	if slices.Contains(settings.SpecialFiles, relUserFile) {
-		fmt.Println("Special merging file", relUserFile)
-		absSysFileOld := filepath.Join(oldSysDir, relUserFile)
-		absSysFileNew := filepath.Join(newSysDir, relUserFile)
-		absUserFileNew := filepath.Join(newUserDir, relUserFile)
-		err := core.MergeSpecialFile(absUserFileOld, absSysFileOld, absSysFileNew, absUserFileNew)
-		if err != nil {
-			return err
-		}
-		return nil
-	} else if oldFileInfo.Mode().IsRegular() {
-		fmt.Println("Keeping user file", relUserFile)
-		err := copyRegular(absUserFileOld, absUserFileNew)
-		return err
-	} else if strings.HasPrefix(userFileType, "L") {
-		fmt.Println("Keeping user symlink", relUserFile)
-		err := copySymlink(absUserFileOld, absUserFileNew)
-		return err
-	} else {
-		return &UnknownFileError{absUserFileOld}
-	}
-}
-
-func clearDirectory(path string) error {
-	entries, err := os.ReadDir(path)
-	if err != nil {
-		return err
-	}
-	for _, entry := range entries {
-		entryPath := filepath.Join(path, entry.Name())
-		if entry.IsDir() {
-			err = clearDirectory(entryPath)
-			if err != nil {
-				return err
-			}
-		}
-		err := os.Remove(entryPath)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func copyRegular(fromPath, toPath string) error {
-	source, err := os.Open(fromPath)
-	if err != nil {
-		return err
-	}
-	defer source.Close()
-
-	destination, err := os.Create(toPath)
-	if err != nil {
-		return err
-	}
-	defer destination.Close()
-
-	fromInfo, err := os.Stat(fromPath)
-	if err != nil {
-		return err
-	}
-
-	err = destination.Chmod(fromInfo.Mode().Perm())
-	if err != nil {
-		return err
-	}
-
-	_, err = io.Copy(destination, source)
-	return err
-}
-
-func copySymlink(fromPath, toPath string) error {
-	sym, err := os.Readlink(fromPath)
-	if err != nil {
-		return err
-	}
-	err = os.Symlink(sym, toPath)
-	return err
-}