safcm: move sync_changes.go and term.go to frontend package

[safcm/safcm.git] / cmd / safcm / sync_sync.go

diff --git a/cmd/safcm/sync_sync.go b/cmd/safcm/sync_sync.go
index 385cfd9a2494bef298a2633bfee634c992e9bf36..7e4d225705eb46dae48c851d033d7364d4eff8cf 100644 (file)
--- a/cmd/safcm/sync_sync.go
+++ b/cmd/safcm/sync_sync.go
@@ -21,12 +21,12 @@ import (
        "fmt"
        "math"
        "os"
-       "path/filepath"
        "sort"
        "strings"
 
        "ruderich.org/simon/safcm"
        "ruderich.org/simon/safcm/cmd/safcm/config"
+       "ruderich.org/simon/safcm/frontend"
        "ruderich.org/simon/safcm/rpc"
 )
 
@@ -45,9 +45,14 @@ func (s *Sync) hostSync(conn *rpc.Conn, detectedGroups []string) error {
        }
 
        // Display changes
-       changes := s.formatChanges(resp)
+       c := frontend.Changes{
+               DryRun: s.config.DryRun,
+               Quiet:  s.config.Quiet,
+               IsTTY:  s.isTTY,
+       }
+       changes := c.FormatChanges(resp)
        if changes != "" {
-               s.logf(safcm.LogInfo, true, "%s", changes)
+               s.log(safcm.LogInfo, true, changes)
        }
 
        if resp.Error != "" {
@@ -255,7 +260,8 @@ func resolveFileDirConflicts(files map[string]*safcm.File) {
                return paths[i] < paths[j]
        })
 
-       const sep = string(filepath.Separator)
+       // Slash separated paths are used for the configuration
+       const sep = "/"
 
        // Remove invalid paths which can result from group_priority
        // overriding paths from another group (e.g. "/foo" as file from one