From be2bf77bf0e3638c92e82125647712845b6be3b0 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sat, 3 Apr 2021 20:30:18 +1100
Subject: [PATCH] WIP

---
 main/main.go            | 18 ++++++++++++++++++
 pkg/gui/gui_test.go     | 14 ++++++++++++--
 pkg/gui/recording.go    |  2 ++
 pkg/gui/view_helpers.go |  2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 main/main.go

diff --git a/main/main.go b/main/main.go
new file mode 100644
index 000000000..9cf194899
--- /dev/null
+++ b/main/main.go
@@ -0,0 +1,18 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+)
+
+func main() {
+	cmd := exec.Command("lazygit")
+	cmd.Env = os.Environ()
+	fmt.Println(cmd.Env)
+	cmd.Stderr = os.Stderr
+	cmd.Stdout = os.Stdout
+	cmd.Stdin = os.Stdin
+	err := cmd.Run()
+	fmt.Println(err)
+}
diff --git a/pkg/gui/gui_test.go b/pkg/gui/gui_test.go
index c513b8399..2fc73609f 100644
--- a/pkg/gui/gui_test.go
+++ b/pkg/gui/gui_test.go
@@ -315,18 +315,27 @@ func runLazygit(t *testing.T, testPath string, rootDir string, record bool, spee
 		cmd.Stdin = os.Stdin
 		cmd.Stderr = os.Stderr
 		cmd.Env = append(
-			cmd.Env,
+			os.Environ(),
 			fmt.Sprintf("RECORD_EVENTS_TO=%s", replayPath),
+			"TERM=xterm-256color",
 		)
 	} else {
+		cmd.Stdout = os.Stdout
+		cmd.Stdin = os.Stdin
+		cmd.Stderr = os.Stderr
 		cmd.Env = append(
-			cmd.Env,
+			os.Environ(),
 			fmt.Sprintf("REPLAY_EVENTS_FROM=%s", replayPath),
+			"TERM=xterm-256color",
 		)
+		t.Log(cmd.Env)
 	}
 
+	t.Log("here")
+
 	// if we're on CI we'll need to use a PTY. We can work that out by seeing if the 'TERM' env is defined.
 	if runInPTY() {
+		t.Log("1")
 		cmd.Env = append(cmd.Env, "TERM=xterm")
 
 		f, err := pty.StartWithSize(cmd, &pty.Winsize{Rows: 100, Cols: 100})
@@ -338,6 +347,7 @@ func runLazygit(t *testing.T, testPath string, rootDir string, record bool, spee
 
 		_ = f.Close()
 	} else {
+		t.Log("2")
 		err := cmd.Run()
 		assert.NoError(t, err)
 	}
diff --git a/pkg/gui/recording.go b/pkg/gui/recording.go
index 75de87334..90b70c1ef 100644
--- a/pkg/gui/recording.go
+++ b/pkg/gui/recording.go
@@ -25,6 +25,7 @@ func (gui *Gui) timeSinceStart() int64 {
 }
 
 func (gui *Gui) replayRecordedEvents() {
+	gui.Log.Warn("going to replay events")
 	if os.Getenv("REPLAY_EVENTS_FROM") == "" {
 		return
 	}
@@ -75,6 +76,7 @@ func (gui *Gui) replayRecordedEvents() {
 			case <-ticker.C:
 				timeWaited += 1
 				if gui.g != nil && timeWaited >= timeToWait {
+					gui.Log.Warn("replaying event")
 					gui.g.ReplayedEvents <- *event.Event
 					break middle
 				}
diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go
index 6fc5fda04..39a9396b6 100644
--- a/pkg/gui/view_helpers.go
+++ b/pkg/gui/view_helpers.go
@@ -319,7 +319,7 @@ func (gui *Gui) getConfirmationView() *gocui.View {
 }
 
 func (gui *Gui) getInformationView() *gocui.View {
-	v, _ := gui.g.View("confirmation")
+	v, _ := gui.g.View("information")
 	return v
 }