From 6b9bbb615d9e026b6493a43d2bdf63cc1abc2a5e Mon Sep 17 00:00:00 2001 From: TorchedSammy <38820196+TorchedSammy@users.noreply.github.com> Date: Fri, 4 Mar 2022 21:54:47 -0400 Subject: [PATCH] fix: handle prompt properly and remove global --- api.go | 6 ++---- main.go | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/api.go b/api.go index 87234a9..3675c59 100644 --- a/api.go +++ b/api.go @@ -174,10 +174,8 @@ These will be formatted and replaced with the appropriate values. --- @param str string */ func hlprompt(L *lua.LState) int { - prompt = L.CheckString(1) - if lr != nil { - lr.SetPrompt(fmtPrompt()) - } + prompt := L.CheckString(1) + lr.SetPrompt(fmtPrompt(prompt)) return 0 } diff --git a/main.go b/main.go index a4a479f..739c7ff 100644 --- a/main.go +++ b/main.go @@ -114,6 +114,7 @@ func main() { go handleSignals() luaInit() + lr = newLineReader("") // If user's config doesn't exixt, if _, err := os.Stat(defaultConfPath); os.IsNotExist(err) && *configflag == defaultConfPath { // Read default from current directory @@ -162,12 +163,10 @@ func main() { os.Exit(0) } - lr = newLineReader("") input: for interactive { running = false - lr.SetPrompt(fmtPrompt()) input, err := lr.Read() if err == io.EOF { @@ -225,7 +224,7 @@ func continuePrompt(prev string) (string, error) { } // This semi cursed function formats our prompt (obviously) -func fmtPrompt() string { +func fmtPrompt(prompt string) string { host, _ := os.Hostname() cwd, _ := os.Getwd()