system: wrap console output functions

This eliminates all fmsg imports from internal/system.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 8 insertions, 14 deletions

diff --git a/internal/system/link.go b/internal/system/link.go
index 9689e253..4182d560 100644
--- a/internal/system/link.go
+++ b/internal/system/link.go
@@ -3,8 +3,6 @@ package system
 import (
 	"fmt"
 	"os"
-
-	"git.gensokyo.uk/security/fortify/internal/fmsg"
 )
 
 // Link registers an Op that links dst to src.
@@ -27,27 +25,23 @@ type Hardlink struct {
 
 func (l *Hardlink) Type() Enablement { return l.et }
 
-func (l *Hardlink) apply(_ *I) error {
-	fmsg.Verbose("linking", l)
-	return fmsg.WrapErrorSuffix(os.Link(l.src, l.dst),
+func (l *Hardlink) apply(sys *I) error {
+	sys.println("linking", l)
+	return sys.wrapErrSuffix(os.Link(l.src, l.dst),
 		fmt.Sprintf("cannot link %q:", l.dst))
 }
 
-func (l *Hardlink) revert(_ *I, ec *Criteria) error {
+func (l *Hardlink) revert(sys *I, ec *Criteria) error {
 	if ec.hasType(l) {
-		fmsg.Verbosef("removing hard link %q", l.dst)
-		return fmsg.WrapErrorSuffix(os.Remove(l.dst),
+		sys.printf("removing hard link %q", l.dst)
+		return sys.wrapErrSuffix(os.Remove(l.dst),
 			fmt.Sprintf("cannot remove hard link %q:", l.dst))
 	} else {
-		fmsg.Verbosef("skipping hard link %q", l.dst)
+		sys.printf("skipping hard link %q", l.dst)
 		return nil
 	}
 }
 
-func (l *Hardlink) Is(o Op) bool {
-	l0, ok := o.(*Hardlink)
-	return ok && l0 != nil && *l == *l0
-}
-
+func (l *Hardlink) Is(o Op) bool   { l0, ok := o.(*Hardlink); return ok && l0 != nil && *l == *l0 }
 func (l *Hardlink) Path() string   { return l.src }
 func (l *Hardlink) String() string { return fmt.Sprintf("%q from %q", l.dst, l.src) }