fix: rather try and interpolate $HOME env var instead of native golang

francoishill · francoishill · commit dc51cd0c8eaf · 2017-06-15T06:38:36.000+02:00
diff --git a/config.go b/config.go
@@ -3,8 +3,8 @@ package main
 import (
 	"io"
 	"os"
-	"os/user"
 	"path/filepath"
+	"strings"
 
 	"github.com/clipperhouse/typewriter"
 )
@@ -22,11 +22,11 @@ var defaultConfig = config{
 }
 
 func mustGetConfigCustomName() string {
-	curUser, err := user.Current()
-	if err != nil {
-		panic(err)
+	homeDir := strings.TrimSpace(os.Getenv("HOME"))
+	if homeDir == "" {
+		panic("Home dir (env $HOME) is required")
 	}
-	return filepath.Join(curUser.HomeDir, "_user_gen.go")
+	return filepath.Join(homeDir, "_user_gen.go")
 }
 
 // keep in sync with imports.go

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package main`
`3`	`3`	`import (`
`4`	`4`	`"io"`
`5`	`5`	`"os"`
`6`		`- "os/user"`
`7`	`6`	`"path/filepath"`
	`7`	`+ "strings"`
`8`	`8`
`9`	`9`	`"github.com/clipperhouse/typewriter"`
`10`	`10`	`)`
`@@ -22,11 +22,11 @@ var defaultConfig = config{`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`func mustGetConfigCustomName() string {`
`25`		`- curUser, err := user.Current()`
`26`		`- if err != nil {`
`27`		`- panic(err)`
	`25`	`+ homeDir := strings.TrimSpace(os.Getenv("HOME"))`
	`26`	`+ if homeDir == "" {`
	`27`	`+ panic("Home dir (env $HOME) is required")`
`28`	`28`	`}`
`29`		`- return filepath.Join(curUser.HomeDir, "_user_gen.go")`
	`29`	`+ return filepath.Join(homeDir, "_user_gen.go")`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`// keep in sync with imports.go`