chore: Tidy up suspicious entries output in doctor command

niiniyare · Nov 1, 2021 · 2307917 · 2307917
1 parent 10f1c1a
commit 2307917
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/internal/cmd/doctorcmd.go b/internal/cmd/doctorcmd.go
@@ -7,7 +7,6 @@ import (
 	"io/fs"
 	"os"
 	"os/exec"
-	"path/filepath"
 	"regexp"
 	"runtime"
 	"sort"
@@ -467,11 +466,7 @@ func (c *suspiciousEntriesCheck) Run(system chezmoi.System, homeDirAbsPath chezm
 			return err
 		}
 		if chezmoi.SuspiciousSourceDirEntry(absPath.Base(), info) {
-			relPath, err := filepath.Rel(c.dirname.String(), absPath.String()) // FIXME add Rel to chezmoi.AbsPath
-			if err != nil {
-				return err
-			}
-			suspiciousEntries = append(suspiciousEntries, relPath)
+			suspiciousEntries = append(suspiciousEntries, absPath.String())
 		}
 		return nil
 	}); {
@@ -481,9 +476,9 @@ func (c *suspiciousEntriesCheck) Run(system chezmoi.System, homeDirAbsPath chezm
 		return checkResultError, err.Error()
 	}
 	if len(suspiciousEntries) > 0 {
-		return checkResultWarning, fmt.Sprintf("%s: %s", c.dirname, englishList(suspiciousEntries))
+		return checkResultWarning, englishList(suspiciousEntries)
 	}
-	return checkResultOK, fmt.Sprintf("%s: no suspicious entries", c.dirname)
+	return checkResultOK, "no suspicious entries"
 }
 
 func (c *umaskCheck) Name() string {

diff --git a/internal/cmd/testdata/scripts/doctor_unix.txt b/internal/cmd/testdata/scripts/doctor_unix.txt
@@ -48,6 +48,12 @@ stdout '^ok\s+config-file\s+'
 stdout '^error\s+source-dir\s+'
 stdout '^ok\s+suspicious-entries\s+'
 
+chhome home3/user
+
+# test that chezmoi doctor warns about suspicious entries
+chezmoi doctor
+stdout '^warning\s+suspicious-entries\s+'
+
 -- bin/age --
 #!/bin/sh
 
@@ -120,3 +126,4 @@ echo "Vault v1.5.5 ('f5d1ddb3750e7c28e25036e1ef26a4c02379fc01+CHANGES')"
 [keepassxc]
     command = "keepassxc"
 -- home/user/.config/chezmoi/chezmoi.yaml --
+-- home3/user/.local/share/chezmoi/.chezmoisuspicious --