From ad14b98b1f5709f35ba7853121fa6826a147561a Mon Sep 17 00:00:00 2001 From: sammyette <38820196+TorchedSammy@users.noreply.github.com> Date: Sun, 16 May 2021 08:43:19 -0400 Subject: [PATCH] feat: lua code can now be aliased --- shell.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/shell.go b/shell.go index 343b32d..1f07e90 100644 --- a/shell.go +++ b/shell.go @@ -14,8 +14,17 @@ import ( ) func RunInput(input string) { + cmdArgs, cmdString := splitInput(input) + + // If alias was found, use command alias + if aliases[cmdArgs[0]] != "" { + alias := aliases[cmdArgs[0]] + cmdString = alias + strings.Trim(cmdString, cmdArgs[0]) + cmdArgs, cmdString = splitInput(cmdString) + } + // First try to load input, essentially compiling to bytecode - fn, err := l.LoadString(input) + fn, err := l.LoadString(cmdString) if err != nil && noexecute { fmt.Println(err) return @@ -33,15 +42,6 @@ func RunInput(input string) { return } - cmdArgs, cmdString := splitInput(input) - - // If alias was found, use command alias - if aliases[cmdArgs[0]] != "" { - alias := aliases[cmdArgs[0]] - cmdString = alias + strings.Trim(cmdString, cmdArgs[0]) - cmdArgs, cmdString = splitInput(cmdString) - } - // If command is defined in Lua then run it if commands[cmdArgs[0]] { err := l.CallByParam(lua.P{