diff --git a/cmd/system.go b/cmd/system.go index 00644e4e1..21f42a684 100644 --- a/cmd/system.go +++ b/cmd/system.go @@ -5,12 +5,11 @@ import ( "fmt" "io/ioutil" "log" + "os" "path/filepath" "runtime" "strconv" "time" - - homedir "github.com/mitchellh/go-homedir" ) // SystemHelper - Defines everything related to the system @@ -38,7 +37,7 @@ func NewSystemHelper() *SystemHelper { // setSystemDirs calculates the system directories it is interested in func (s *SystemHelper) setSystemDirs() { var err error - s.homeDir, err = homedir.Dir() + s.homeDir, err = os.UserHomeDir() if err != nil { log.Fatal("Cannot find home directory! Please file a bug report!") } @@ -132,7 +131,7 @@ func (s *SystemHelper) setup() error { } const introText = ` -Wails is a lightweight framework for creating web-like desktop apps in Go. +Wails is a lightweight framework for creating web-like desktop apps in Go. I'll need to ask you a few questions so I can fill in your project templates and then I will try and see if you have the correct dependencies installed. If you don't have the right tools installed, I'll try and suggest how to install them. ` diff --git a/cmd/wails/8_update.go b/cmd/wails/8_update.go index 1a021b64e..70224aa49 100644 --- a/cmd/wails/8_update.go +++ b/cmd/wails/8_update.go @@ -3,9 +3,9 @@ package main import ( "fmt" "log" + "os" "github.com/leaanthony/spinner" - "github.com/mitchellh/go-homedir" "github.com/wailsapp/wails/cmd" ) @@ -146,7 +146,7 @@ func updateToVersion(targetVersion *cmd.SemanticVersion, force bool) error { updateSpinner.Start("Installing Wails " + desiredVersion) // Run command in non module directory - homeDir, err := homedir.Dir() + homeDir, err := os.UserHomeDir() if err != nil { log.Fatal("Cannot find home directory! Please file a bug report!") } diff --git a/go.mod b/go.mod index fb99f7ea3..13755b0e5 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,6 @@ require ( github.com/leaanthony/spinner v0.5.3 github.com/mattn/go-colorable v0.1.1 // indirect github.com/mattn/go-isatty v0.0.7 // indirect - github.com/mitchellh/go-homedir v1.1.0 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 github.com/pkg/errors v0.8.1 // indirect diff --git a/go.sum b/go.sum index b13192649..625063e9d 100644 --- a/go.sum +++ b/go.sum @@ -46,8 +46,6 @@ github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= -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/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 h1:49lOXmGaUpV9Fz3gd7TFZY106KVlPVa5jcYD1gaQf98= diff --git a/runtime/filesystem.go b/runtime/filesystem.go index 96bfcffd1..ebb4feda0 100644 --- a/runtime/filesystem.go +++ b/runtime/filesystem.go @@ -1,9 +1,9 @@ package runtime -import homedir "github.com/mitchellh/go-homedir" +import "os" // FileSystem exposes file system utilities to the runtime -type FileSystem struct {} +type FileSystem struct{} // NewFileSystem creates a new FileSystem struct func NewFileSystem() *FileSystem { @@ -12,5 +12,5 @@ func NewFileSystem() *FileSystem { // HomeDir returns the user's home directory func (r *FileSystem) HomeDir() (string, error) { - return homedir.Dir() + return os.UserHomeDir() }