summaryrefslogtreecommitdiffstats
path: root/main.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2018-08-09 13:29:25 +1000
committerJesse Duffield <jessedduffield@gmail.com>2018-08-09 13:29:25 +1000
commit750445dc8b653f6f0225b58ce5ebc9e9abd2c34d (patch)
treeb73efc1612408ae23e79d33ac52d537483a0e44d /main.go
parent1f5f80b1bf36a94bbe8994f7bb164793a3c27f21 (diff)
use platform agnostic filepaths
Diffstat (limited to 'main.go')
-rw-r--r--main.go14
1 files changed, 9 insertions, 5 deletions
diff --git a/main.go b/main.go
index 1e0a26eed..0f189bbd7 100644
--- a/main.go
+++ b/main.go
@@ -38,16 +38,21 @@ func homeDirectory() string {
return usr.HomeDir
}
+func projectPath(path string) string {
+ gopath := os.Getenv("GOPATH")
+ return filepath.FromSlash(gopath + "/src/github.com/jesseduffield/lazygit/" + path)
+}
+
func devLog(objects ...interface{}) {
- localLog(color.FgWhite, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/development.log", objects...)
+ localLog(color.FgWhite, projectPath("development.log"), objects...)
}
func colorLog(colour color.Attribute, objects ...interface{}) {
- localLog(colour, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/development.log", objects...)
+ localLog(colour, projectPath("development.log"), objects...)
}
func commandLog(objects ...interface{}) {
- localLog(color.FgWhite, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/commands.log", objects...)
+ localLog(color.FgWhite, projectPath("commands.log"), objects...)
}
func localLog(colour color.Attribute, path string, objects ...interface{}) {
@@ -75,8 +80,7 @@ func navigateToRepoRootDirectory() {
// with `date` and `commit`. If this program has been opened directly via go,
// we will populate the `version` with VERSION in the lazygit root directory
func fallbackVersion() string {
- gopath := os.Getenv("GOPATH")
- path := filepath.FromSlash(gopath + "/src/github.com/jesseduffield/lazygit/VERSION")
+ path := projectPath("VERSION")
byteVersion, err := ioutil.ReadFile(path)
if err != nil {
return "unversioned"