Simplify $HOME prefix check

qjcg · sagikazarmark · commit 3826be313591 · 2020-07-31T23:39:06.000+02:00
diff --git a/util.go b/util.go
@@ -91,8 +91,7 @@ func insensitiviseMap(m map[string]interface{}) {
 func absPathify(inPath string) string {
 	jww.INFO.Println("Trying to resolve absolute path to", inPath)
 
-	if strings.HasPrefix(inPath, "$HOME") &&
-		(len(inPath) == 5 || inPath[5] == os.PathSeparator) {
+	if inPath == "$HOME" || strings.HasPrefix(inPath, "$HOME"+string(os.PathSeparator)) {
 		inPath = userHomeDir() + inPath[5:]
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,7 @@ func insensitiviseMap(m map[string]interface{}) {`
`91`	`91`	`func absPathify(inPath string) string {`
`92`	`92`	`jww.INFO.Println("Trying to resolve absolute path to", inPath)`
`93`	`93`
`94`		`- if strings.HasPrefix(inPath, "$HOME") &&`
`95`		`- (len(inPath) == 5 \|\| inPath[5] == os.PathSeparator) {`
	`94`	`+ if inPath == "$HOME" \|\| strings.HasPrefix(inPath, "$HOME"+string(os.PathSeparator)) {`
`96`	`95`	`inPath = userHomeDir() + inPath[5:]`
`97`	`96`	`}`
`98`	`97`