sammyette
/
Hilbish
mirror of https://github.com/Hilbis/Hilbish
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: move xdg vars to table

pull/71/head
L3af 2021-10-08 13:54:57 +13:00
parent a3a73b8405
commit 878b14eb40
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hilbish.go
View File

@ -33,8 +33,11 @@ func HilbishLoader(L *lua.LState) int {
L.SetField(mod, "user", lua.LString(username))
L.SetField(mod, "host", lua.LString(host))
L.SetField(mod, "home", lua.LString(homedir))
L.SetField(mod, "xdgConfig", lua.LString(confDir))
L.SetField(mod, "xdgData", lua.LString(getenv("XDG_DATA_HOME", homedir + "/.local/share/")))
xdg := L.NewTable()
L.SetField(xdg, "config", lua.LString(confDir))
L.SetField(xdg, "data", lua.LString(getenv("XDG_DATA_HOME", homedir + "/.local/share/")))
L.SetField(mod, "xdg", xdg)
L.Push(mod)

12
vars_linux.go
View File

@ -7,12 +7,12 @@ var (
requirePaths = `';./libs/?/?.lua;./libs/?/init.lua;./?/init.lua;./?/?.lua'
.. ';/usr/share/hilbish/libs/?/init.lua;'
.. ';/usr/share/hilbish/libs/?/?.lua;'
.. hilbish.xdgData .. '/hilbish/libs/?/init.lua;'
.. hilbish.xdgData .. '/hilbish/libs/?/?.lua;'
.. hilbish.xdgData .. '/hilbish/libs/?.lua'
.. hilbish.xdgConfig .. '/?/init.lua'
.. hilbish.xdgConfig .. '/?/?.lua'
.. hilbish.xdgConfig .. '/?.lua'`
.. hilbish.xdg.data .. '/hilbish/libs/?/init.lua;'
.. hilbish.xdg.data .. '/hilbish/libs/?/?.lua;'
.. hilbish.xdg.data .. '/hilbish/libs/?.lua'
.. hilbish.xdg.config .. '/?/init.lua'
.. hilbish.xdg.config .. '/?/?.lua'
.. hilbish.xdg.config .. '/?.lua'`
preloadPath = "/usr/share/hilbish/preload.lua"
sampleConfPath = "/usr/share/hilbish/.hilbishrc.lua" // Path to default/sample config
)