summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gitcommands.go34
-rw-r--r--main.go37
2 files changed, 37 insertions, 34 deletions
diff --git a/gitcommands.go b/gitcommands.go
index ba6de342e..7df29170a 100644
--- a/gitcommands.go
+++ b/gitcommands.go
@@ -5,10 +5,8 @@ import (
// "log"
"errors"
"fmt"
- "log"
"os"
"os/exec"
- "os/user"
"strings"
"time"
@@ -50,38 +48,6 @@ type StashEntry struct {
DisplayString string
}
-func homeDirectory() string {
- usr, err := user.Current()
- if err != nil {
- log.Fatal(err)
- }
- return usr.HomeDir
-}
-
-func devLog(objects ...interface{}) {
- localLog(color.FgWhite, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/development.log", objects...)
-}
-
-func colorLog(colour color.Attribute, objects ...interface{}) {
- localLog(colour, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/development.log", objects...)
-}
-
-func commandLog(objects ...interface{}) {
- localLog(color.FgWhite, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/commands.log", objects...)
-}
-
-func localLog(colour color.Attribute, path string, objects ...interface{}) {
- if !debugging {
- return
- }
- f, _ := os.OpenFile(path, os.O_APPEND|os.O_WRONLY, 0644)
- defer f.Close()
- for _, object := range objects {
- colorFunction := color.New(colour).SprintFunc()
- f.WriteString(colorFunction(fmt.Sprint(object)) + "\n")
- }
-}
-
// Map (from https://gobyexample.com/collection-functions)
func Map(vs []string, f func(string) string) []string {
vsm := make([]string, len(vs))
diff --git a/main.go b/main.go
index 1ca5357da..a84700ccf 100644
--- a/main.go
+++ b/main.go
@@ -3,7 +3,12 @@ package main
import (
"flag"
"fmt"
+ "log"
+ "os"
+ "os/user"
"time"
+
+ "github.com/fatih/color"
)
var (
@@ -11,6 +16,38 @@ var (
debugging bool
)
+func homeDirectory() string {
+ usr, err := user.Current()
+ if err != nil {
+ log.Fatal(err)
+ }
+ return usr.HomeDir
+}
+
+func devLog(objects ...interface{}) {
+ localLog(color.FgWhite, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/development.log", objects...)
+}
+
+func colorLog(colour color.Attribute, objects ...interface{}) {
+ localLog(colour, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/development.log", objects...)
+}
+
+func commandLog(objects ...interface{}) {
+ localLog(color.FgWhite, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/commands.log", objects...)
+}
+
+func localLog(colour color.Attribute, path string, objects ...interface{}) {
+ if !debugging {
+ return
+ }
+ f, _ := os.OpenFile(path, os.O_APPEND|os.O_WRONLY, 0644)
+ defer f.Close()
+ for _, object := range objects {
+ colorFunction := color.New(colour).SprintFunc()
+ f.WriteString(colorFunction(fmt.Sprint(object)) + "\n")
+ }
+}
+
func main() {
debuggingPointer := flag.Bool("debug", false, "a boolean")
flag.Parse()