diff --git a/vars.go b/vars.go index faaed98..2296d43 100644 --- a/vars.go +++ b/vars.go @@ -5,6 +5,7 @@ var ( version = "v0.5.1" defaultConfDir = "" // ~ will be substituted for home, path for user's default config defaultHistDir = "" + commonRequirePaths = "';./libs/?/init.lua;./?/init.lua;./?/?.lua'" prompt string // Prompt will always get changed anyway multilinePrompt = "> " diff --git a/vars_linux.go b/vars_linux.go index f62d844..a523110 100644 --- a/vars_linux.go +++ b/vars_linux.go @@ -4,9 +4,10 @@ package main // String vars that are free to be changed at compile time var ( - requirePaths = `';./libs/?/?.lua;./libs/?/init.lua;./?/init.lua;./?/?.lua' + requirePaths = commonRequirePaths + ` .. ';/usr/share/hilbish/libs/?/init.lua;' - .. ';/usr/share/hilbish/libs/?/?.lua;' + .. ';/usr/share/hilbish/libs/?/?.lua;'` + linuxUserPaths + linuxUserPaths = ` .. hilbish.xdg.data .. '/hilbish/libs/?/init.lua;' .. hilbish.xdg.data .. '/hilbish/libs/?/?.lua;' .. hilbish.xdg.data .. '/hilbish/libs/?.lua' diff --git a/vars_windows.go b/vars_windows.go index 8247c5a..a32f652 100644 --- a/vars_windows.go +++ b/vars_windows.go @@ -4,7 +4,7 @@ package main // String vars that are free to be changed at compile time var ( - requirePaths = `';./libs/?/init.lua;./?/init.lua;./?/?.lua' + requirePaths = commonRequirePaths + ` .. hilbish.home .. '\\Appdata\\Roaming\\Hilbish\\libs\\?\\init.lua;' .. hilbish.home .. '\\Appdata\\Roaming\\Hilbish\\libs\\?\\?.lua;'` dataDir = "~\\Appdata\\Roaming\\Hilbish" // ~ and \ gonna cry?