mirror of
https://github.com/Hilbis/Hilbish
synced 2025-05-13 15:53:23 +00:00
e5c8e5eaff
fixes an issue with expanded aliases being added to history with a recent commit (6th time now with this issue?) and makes behavior with other runners consistent this can technically be a breaking change to people overriding the sh runner function
66 lines
1.6 KiB
Go
66 lines
1.6 KiB
Go
package main
|
|
|
|
import (
|
|
"hilbish/util"
|
|
|
|
rt "github.com/arnodel/golua/runtime"
|
|
)
|
|
|
|
func runnerModeLoader(rtm *rt.Runtime) *rt.Table {
|
|
exports := map[string]util.LuaExport{
|
|
"sh": {shRunner, 1, false},
|
|
"lua": {luaRunner, 1, false},
|
|
"setMode": {hlrunnerMode, 1, false},
|
|
}
|
|
|
|
mod := rt.NewTable()
|
|
util.SetExports(rtm, mod, exports)
|
|
|
|
return mod
|
|
}
|
|
|
|
func shRunner(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
|
|
if err := c.Check1Arg(); err != nil {
|
|
return nil, err
|
|
}
|
|
cmd, err := c.StringArg(0)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
_, exitCode, cont, err := execSh(aliases.Resolve(cmd))
|
|
var luaErr rt.Value = rt.NilValue
|
|
if err != nil {
|
|
luaErr = rt.StringValue(err.Error())
|
|
}
|
|
runnerRet := rt.NewTable()
|
|
runnerRet.Set(rt.StringValue("input"), rt.StringValue(cmd))
|
|
runnerRet.Set(rt.StringValue("exitCode"), rt.IntValue(int64(exitCode)))
|
|
runnerRet.Set(rt.StringValue("continue"), rt.BoolValue(cont))
|
|
runnerRet.Set(rt.StringValue("err"), luaErr)
|
|
|
|
return c.PushingNext(t.Runtime, rt.TableValue(runnerRet)), nil
|
|
}
|
|
|
|
func luaRunner(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
|
|
if err := c.Check1Arg(); err != nil {
|
|
return nil, err
|
|
}
|
|
cmd, err := c.StringArg(0)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
input, exitCode, err := handleLua(cmd)
|
|
var luaErr rt.Value = rt.NilValue
|
|
if err != nil {
|
|
luaErr = rt.StringValue(err.Error())
|
|
}
|
|
runnerRet := rt.NewTable()
|
|
runnerRet.Set(rt.StringValue("input"), rt.StringValue(input))
|
|
runnerRet.Set(rt.StringValue("exitCode"), rt.IntValue(int64(exitCode)))
|
|
runnerRet.Set(rt.StringValue("err"), luaErr)
|
|
|
|
return c.PushingNext(t.Runtime, rt.TableValue(runnerRet)), nil
|
|
}
|