Compare commits

..

6 Commits

Author SHA1 Message Date
sammyette 2b5e65e47a
chore: bump version 2021-06-15 19:33:51 -04:00
sammyette 9dda3cb372
feat: add ~/.config/hilbish to require path 2021-06-15 19:17:56 -04:00
sammyette e5a0f627b8
fix: use hilbish.home for require paths 2021-06-15 19:16:22 -04:00
sammyette 805eefcd17
fix: use hilbish.home instead of home env var 2021-06-14 18:12:12 -04:00
sammyette eab3f27ebf
fix: throw cd hook only after changing directory 2021-06-14 18:11:07 -04:00
sammyette 30ffe9cab0
fix: handle error before getting commander exit code
this fixes a register underflow issue if a commander causes an error
2021-06-14 18:02:44 -04:00
3 changed files with 16 additions and 10 deletions

View File

@ -10,7 +10,6 @@ if shlvl ~= nil then os.setenv('SHLVL', shlvl + 1) else os.setenv('SHLVL', 1) en
-- Builtins
commander.register('cd', function (args)
bait.throw('cd', args)
if #args > 0 then
local path = ''
for i = 1, #args do
@ -32,9 +31,11 @@ commander.register('cd', function (args)
end
return err
end
bait.throw('cd', path)
return
end
fs.cd(os.getenv 'HOME')
fs.cd(hilbish.home)
bait.throw('cd', hilbish.home)
return
end)

View File

@ -56,6 +56,12 @@ func RunInput(input string) {
NRet: 1,
Protect: true,
}, luar.New(l, cmdArgs[1:]))
if err != nil {
fmt.Fprintln(os.Stderr,
"Error in command:\n\n" + err.Error())
hooks.Em.Emit("command.exit", 1)
return
}
luaexitcode := l.Get(-1)
var exitcode uint8 = 0
@ -65,10 +71,6 @@ func RunInput(input string) {
exitcode = uint8(code)
}
if err != nil {
fmt.Fprintln(os.Stderr,
"Error in command:\n\n" + err.Error())
}
hooks.Em.Emit("command.exit", exitcode)
return
}

11
vars.go
View File

@ -2,13 +2,16 @@ package main
// String vars that are free to be changed at compile time
var (
version = "v0.5.0"
version = "v0.5.1"
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'`
.. hilbish.home .. '/.local/share/hilbish/libs/?/init.lua;'
.. hilbish.home .. '/.local/share/hilbish/libs/?/?.lua;'
.. hilbish.home .. '/.local/share/hilbish/libs/?.lua'
.. hilbish.home .. '/.config/hilbish/?/init.lua'
.. hilbish.home .. '/.config/hilbish/?/?.lua'
.. hilbish.home .. '/.config/hilbish/?.lua'`
preloadPath = "/usr/share/hilbish/preload.lua"
defaultConfDir = "" // ~ will be substituted for home, path for user's default config
sampleConfPath = "/usr/share/hilbish/.hilbishrc.lua" // Path to default/sample config