From e37abcb08b0c1f576d981e134797f66943c84ecb Mon Sep 17 00:00:00 2001 From: sammyette <38820196+TorchedSammy@users.noreply.github.com> Date: Tue, 8 Jun 2021 21:00:31 -0400 Subject: [PATCH] feat: define preload file in var same as before, enables changing at compile time --- lua.go | 2 +- vars.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lua.go b/lua.go index 83bc791..7151c1c 100644 --- a/lua.go +++ b/lua.go @@ -62,7 +62,7 @@ func LuaInit() { err := l.DoFile("preload.lua") if err != nil { - err = l.DoFile("/usr/share/hilbish/preload.lua") + err = l.DoFile(preloadPath) if err != nil { fmt.Fprintln(os.Stderr, "Missing preload file, builtins may be missing.") diff --git a/vars.go b/vars.go index c8eda21..f152c4e 100644 --- a/vars.go +++ b/vars.go @@ -9,6 +9,7 @@ var ( .. os.getenv 'HOME' .. '/.local/share/hilbish/libs/?/init.lua;' .. os.getenv 'HOME' .. '/.local/share/hilbish/libs/?/?.lua;' .. os.getenv 'HOME' .. '/.local/share/hilbish/libs/?.lua'` + preloadPath = "/usr/share/hilbish/preload.lua" prompt string // Prompt will always get changed anyway multilinePrompt = "> " @@ -20,6 +21,5 @@ var ( interactive bool login bool // Are we the login shell? noexecute bool // Should we run Lua or only report syntax errors - )