Merge branch 'master' into fix-uuid-error

sachaos · Jan 20, 2019 · 2b92966 · 2b92966
2 parents 48a4593 + 5c6c1d8
commit 2b92966
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/gofrs/uuid v3.2.0+incompatible
 	github.com/mattn/go-colorable v0.0.9 // indirect
 	github.com/mattn/go-isatty v0.0.4 // indirect
-	github.com/mitchellh/go-homedir v1.0.0
+	github.com/mitchellh/go-homedir v1.0.0 // indirect
 	github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/spf13/viper v1.2.1

diff --git a/main.go b/main.go
@@ -11,14 +11,15 @@ import (
 	"path/filepath"
 
 	"github.com/fatih/color"
+	"github.com/mitchellh/go-homedir"
 	"github.com/sachaos/todoist/lib"
 	"github.com/spf13/viper"
 	"github.com/urfave/cli"
 )
 
 var (
-	configPath         = os.Getenv("HOME")
-	default_cache_path = os.Getenv("HOME") + "/.todoist.cache.json"
+	configPath, _      = homedir.Dir()
+	default_cache_path = filepath.Join(configPath, ".todoist.cache.json")
 	CommandFailed      = errors.New("command failed")
 	IdNotFound         = errors.New("specified id not found")
 	writer             Writer