diff --git a/lua.go b/lua.go index bfb41b4..83bc791 100644 --- a/lua.go +++ b/lua.go @@ -58,14 +58,7 @@ func LuaInit() { l.PreloadModule("bait", hooks.Loader) // Add more paths that Lua can require from - l.DoString(`package.path = package.path - .. ';./libs/?/init.lua;./?/init.lua;./?/?.lua' - .. ';/usr/share/hilbish/libs/?/init.lua;' - .. ';/usr/share/hilbish/libs/?/?.lua;' - .. 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' - `) + l.DoString("package.path = package.path .. " + requirePaths) err := l.DoFile("preload.lua") if err != nil { diff --git a/main.go b/main.go index 974adaa..f3afecc 100644 --- a/main.go +++ b/main.go @@ -18,26 +18,17 @@ import ( "golang.org/x/term" ) - var ( - version = "v0.4.0" l *lua.LState lr *LineReader - prompt string // User's prompt, this will get set when lua side is initialized - multilinePrompt = "> " - commands = map[string]bool{} aliases = map[string]string{} homedir string curuser *user.User - running bool // Is a command currently running hooks bait.Bait - interactive bool - login bool // Are we the login shell? - noexecute bool // Should we run Lua or only report syntax errors ) func main() { diff --git a/vars.go b/vars.go new file mode 100644 index 0000000..c8eda21 --- /dev/null +++ b/vars.go @@ -0,0 +1,25 @@ +package main + +// String vars that are free to be changed at compile time +var ( + version = "v0.4.0" + requirePaths = `';./libs/?/init.lua;./?/init.lua;./?/?.lua' + .. ';/usr/share/hilbish/libs/?/init.lua;' + .. ';/usr/share/hilbish/libs/?/?.lua;' + .. 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'` + + prompt string // Prompt will always get changed anyway + multilinePrompt = "> " +) + +// Flags +var ( + running bool // Is a command currently running + interactive bool + login bool // Are we the login shell? + noexecute bool // Should we run Lua or only report syntax errors + +) +