X-Git-Url: https://ruderich.org/simon/gitweb/?p=safcm%2Fsafcm.git;a=blobdiff_plain;f=cmd%2Fsafcm%2Fsync_changes.go;h=f597ae1a7fdc6b3532bbc1f15a22a3dae7ae2b4b;hp=3e91768bfca3eb3273e5c24954c506f86934a63b;hb=8222dd7be72bef3773eb66b04af6094e584b13fb;hpb=17e43bcada25c22f459827851faa34f8f4df3d33

diff --git a/cmd/safcm/sync_changes.go b/cmd/safcm/sync_changes.go
index 3e91768..f597ae1 100644
--- a/cmd/safcm/sync_changes.go
+++ b/cmd/safcm/sync_changes.go
@@ -66,11 +66,12 @@ func (s *Sync) formatChanges(resp safcm.MsgSyncResp) string {
 
 func (s *Sync) formatFileChanges(changes []safcm.FileChange) string {
 	var buf strings.Builder
-	fmt.Fprintf(&buf, "changed %d file(s):", len(changes))
 	if s.config.DryRun {
-		fmt.Fprintf(&buf, " (dry-run)")
+		fmt.Fprintf(&buf, "will change %d file(s): (dry-run)\n",
+			len(changes))
+	} else {
+		fmt.Fprintf(&buf, "changed %d file(s):\n", len(changes))
 	}
-	fmt.Fprintf(&buf, "\n")
 	for _, x := range changes {
 		fmt.Fprintf(&buf, "%s:", s.formatTarget(x.Path))
 
@@ -116,7 +117,6 @@ func (s *Sync) formatFileChanges(changes []safcm.FileChange) string {
 		}
 		fmt.Fprintf(&buf, "\n")
 	}
-
 	return buf.String()
 }
 func formatFileType(info safcm.FileChangeInfo) string {
@@ -142,11 +142,12 @@ func formatFilePerm(info safcm.FileChangeInfo) string {
 
 func (s *Sync) formatPackageChanges(changes []safcm.PackageChange) string {
 	var buf strings.Builder
-	fmt.Fprintf(&buf, "installed %d package(s):", len(changes))
 	if s.config.DryRun {
-		fmt.Fprintf(&buf, " (dry-run)")
+		fmt.Fprintf(&buf, "will install %d package(s): (dry-run)\n",
+			len(changes))
+	} else {
+		fmt.Fprintf(&buf, "installed %d package(s):\n", len(changes))
 	}
-	fmt.Fprintf(&buf, "\n")
 	for _, x := range changes {
 		// TODO: indicate if installation failed
 		fmt.Fprintf(&buf, "%s\n", s.formatTarget(x.Name))
@@ -156,11 +157,12 @@ func (s *Sync) formatPackageChanges(changes []safcm.PackageChange) string {
 
 func (s *Sync) formatServiceChanges(changes []safcm.ServiceChange) string {
 	var buf strings.Builder
-	fmt.Fprintf(&buf, "modified %d service(s):", len(changes))
 	if s.config.DryRun {
-		fmt.Fprintf(&buf, " (dry-run)")
+		fmt.Fprintf(&buf, "will modify %d service(s): (dry-run)\n",
+			len(changes))
+	} else {
+		fmt.Fprintf(&buf, "modified %d service(s):\n", len(changes))
 	}
-	fmt.Fprintf(&buf, "\n")
 	for _, x := range changes {
 		var info []string
 		if x.Started {
@@ -197,7 +199,11 @@ func (s *Sync) formatCommandChanges(changes []safcm.CommandChange) string {
 	}
 
 	var buf strings.Builder
-	fmt.Fprintf(&buf, "executed %d command(s)", len(changes))
+	if s.config.DryRun {
+		fmt.Fprintf(&buf, "will execute %d command(s)", len(changes))
+	} else {
+		fmt.Fprintf(&buf, "executed %d command(s)", len(changes))
+	}
 	if noOutput > 0 && !s.config.DryRun {
 		fmt.Fprintf(&buf, ", %d with no output", noOutput)
 	}