feat: use stdlib for homedir lookup

chetan · chetan · commit 3a300a9d02be · 2025-01-15T14:07:35.000-05:00
diff --git a/bin/vproxy/config.go b/bin/vproxy/config.go
@@ -7,7 +7,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mitchellh/go-homedir"
 	"github.com/pelletier/go-toml"
 	"github.com/urfave/cli/v2"
 )
@@ -65,7 +64,7 @@ func findConfig(files ...string) string {
 }
 
 func homeConfPath() string {
-	d, err := homedir.Dir()
+	d, err := os.UserHomeDir()
 	if err == nil {
 		return path.Join(d, ".vproxy.conf")
 	}
diff --git a/cert.go b/cert.go
@@ -7,7 +7,6 @@ import (
 	"path/filepath"
 
 	"github.com/jittering/truststore"
-	"github.com/mitchellh/go-homedir"
 )
 
 var ts *truststore.MkcertLib
@@ -48,7 +47,7 @@ func CertPath() string {
 	}
 
 	// default to user homedir
-	d, err := homedir.Dir()
+	d, err := os.UserHomeDir()
 	if err != nil {
 		log.Fatalf("failed to locate homedir: %s", err)
 	}
diff --git a/daemon.go b/daemon.go
@@ -13,7 +13,6 @@ import (
 	"syscall"
 
 	"github.com/mattn/go-isatty"
-	"github.com/mitchellh/go-homedir"
 )
 
 // Controls whether verbose messages should be printed
@@ -67,7 +66,7 @@ func rerunWithSudo(addr string) {
 	args = append(args, os.Args[1:]...)
 
 	// pass some locations to sudo env
-	home, e := homedir.Dir()
+	home, e := os.UserHomeDir()
 	if e != nil {
 		log.Fatal(e)
 	}
diff --git a/go.mod b/go.mod
@@ -9,7 +9,6 @@ require (
 	github.com/gammazero/deque v1.0.0
 	github.com/jittering/truststore v1.4.4-lib.0.20220731155747-7bcc05146bce
 	github.com/mattn/go-isatty v0.0.20
-	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pelletier/go-toml v1.9.5
 	github.com/shirou/gopsutil v3.21.11+incompatible
 	github.com/txn2/txeh v1.5.5
diff --git a/go.sum b/go.sum
@@ -14,8 +14,6 @@ github.com/jittering/truststore v1.4.4-lib.0.20220731155747-7bcc05146bce h1:wpNR
 github.com/jittering/truststore v1.4.4-lib.0.20220731155747-7bcc05146bce/go.mod h1:2Km3X+q1z85nxbB/+/fvzNdvDpFc6Lmhc0ZLtwZm5jo=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ import (`
`7`	`7`	`"strconv"`
`8`	`8`	`"strings"`
`9`	`9`
`10`		`- "github.com/mitchellh/go-homedir"`
`11`	`10`	`"github.com/pelletier/go-toml"`
`12`	`11`	`"github.com/urfave/cli/v2"`
`13`	`12`	`)`
`@@ -65,7 +64,7 @@ func findConfig(files ...string) string {`
`65`	`64`	`}`
`66`	`65`
`67`	`66`	`func homeConfPath() string {`
`68`		`- d, err := homedir.Dir()`
	`67`	`+ d, err := os.UserHomeDir()`
`69`	`68`	`if err == nil {`
`70`	`69`	`return path.Join(d, ".vproxy.conf")`
`71`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ import (`
`7`	`7`	`"path/filepath"`
`8`	`8`
`9`	`9`	`"github.com/jittering/truststore"`
`10`		`- "github.com/mitchellh/go-homedir"`
`11`	`10`	`)`
`12`	`11`
`13`	`12`	`var ts *truststore.MkcertLib`
`@@ -48,7 +47,7 @@ func CertPath() string {`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`// default to user homedir`
`51`		`- d, err := homedir.Dir()`
	`50`	`+ d, err := os.UserHomeDir()`
`52`	`51`	`if err != nil {`
`53`	`52`	`log.Fatalf("failed to locate homedir: %s", err)`
`54`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ import (`
`13`	`13`	`"syscall"`
`14`	`14`
`15`	`15`	`"github.com/mattn/go-isatty"`
`16`		`- "github.com/mitchellh/go-homedir"`
`17`	`16`	`)`
`18`	`17`
`19`	`18`	`// Controls whether verbose messages should be printed`
`@@ -67,7 +66,7 @@ func rerunWithSudo(addr string) {`
`67`	`66`	`args = append(args, os.Args[1:]...)`
`68`	`67`
`69`	`68`	`// pass some locations to sudo env`
`70`		`- home, e := homedir.Dir()`
	`69`	`+ home, e := os.UserHomeDir()`
`71`	`70`	`if e != nil {`
`72`	`71`	`log.Fatal(e)`
`73`	`72`	`}`