lua.go

@@ -3,9 +3,7 @@ package main
 import (
 	"fmt"
 	"os"
-	"os/exec"
 	"strings"
-	"syscall"
 
 	"hilbish/golibs/bait"
 	"hilbish/golibs/commander"
@@ -33,7 +31,6 @@ func LuaInit() {
 	l.SetGlobal("multiprompt", l.NewFunction(hshmlprompt))
 	l.SetGlobal("alias", l.NewFunction(hshalias))
 	l.SetGlobal("appendPath", l.NewFunction(hshappendPath))
-	l.SetGlobal("exec", l.NewFunction(hshexec))
 
 	// Add fs module to Lua
 	l.PreloadModule("fs", fs.Loader)
@@ -65,9 +62,9 @@ func LuaInit() {
 	.. os.getenv 'HOME'	.. '/.local/share/hilbish/libs/?.lua'
 	`)
 
-	err := l.DoFile("preload.lua")
+	err := l.DoFile("/usr/share/hilbish/preload.lua")
 	if err != nil {
-		err = l.DoFile("/usr/share/hilbish/preload.lua")
+		err = l.DoFile("preload.lua")
 		if err != nil {
 			fmt.Fprintln(os.Stderr,
 				"Missing preload file, builtins may be missing.")
@@ -130,19 +127,3 @@ func hshappendPath(L *lua.LState) int {
 
 	return 0
 }
-
-func hshexec(L *lua.LState) int {
-	cmd := L.CheckString(1)
-	cmdArgs, _ := splitInput(cmd)
-	cmdPath, err := exec.LookPath(cmdArgs[0])
-	if err != nil {
-		fmt.Println(err)
-		// if we get here, cmdPath will be nothing
-		// therefore nothing will run
-	}
-
-	// syscall.Exec requires an absolute path to a binary
-	// path, args, string slice of environments
-	syscall.Exec(cmdPath, cmdArgs, os.Environ())
-	return 0
-}

main.go

@@ -14,11 +14,10 @@ import (
 	"github.com/pborman/getopt"
 	"github.com/bobappleyard/readline"
 	"github.com/yuin/gopher-lua"
-	"layeh.com/gopher-luar"
 	"golang.org/x/term"
 )
 
-const version = "0.4.1-dev.8"
+const version = "0.4.0"
 
 var (
 	l *lua.LState
@@ -47,11 +46,11 @@ func main() {
 //	parser := argparse.NewParser("hilbish", "A shell for lua and flower lovers")
 	verflag := getopt.BoolLong("version", 'v', "Prints Hilbish version")
 	setshflag := getopt.BoolLong("setshellenv", 'S', "Sets $SHELL to Hilbish's executed path")
-	cmdflag := getopt.StringLong("command", 'c', "", "Executes a command on startup")
+	cmdflag := getopt.StringLong("command", 'c', "", /*TODO: Help description*/ "")
 	configflag := getopt.StringLong("config", 'C', defaultconfpath, "Sets the path to Hilbish's config")
 	getopt.BoolLong("login", 'l', "Makes Hilbish act like a login shell")
 	getopt.BoolLong("interactive", 'i', "Force Hilbish to be an interactive shell")
-	getopt.BoolLong("noexec", 'n', "Don't execute and only report Lua syntax errors")
+	getopt.BoolLong("noexec", 'n', "Force Hilbish to be an interactive shell")
 
 	getopt.Parse()
 	loginshflag := getopt.Lookup('l').Seen()
@@ -119,7 +118,6 @@ func main() {
 
 	RunInput(*cmdflag)
 	if getopt.NArgs() > 0 {
-		l.SetGlobal("args", luar.New(l, getopt.Args()))
 		err := l.DoFile(getopt.Arg(0))
 		if err != nil {
 			fmt.Fprintln(os.Stderr, err)

preload.lua

@@ -20,8 +20,8 @@ commander.register('cd', function (args)
 			if err == 1 then
 				print('directory does not exist')
 			end
-			return err
-		end
+			bait.throw('command.exit', err)
+		else bait.throw('command.exit', 0) end
 		return
 	end
 	fs.cd(os.getenv 'HOME')

shell.go

@@ -52,17 +52,9 @@ func RunInput(input string) {
 					l.GetGlobal("commanding"),
 					lua.LString("__commands")),
 				cmdArgs[0]),
-			NRet:    1,
+			NRet:    0,
 			Protect: true,
 		}, luar.New(l, cmdArgs[1:]))
-		luaexitcode := l.Get(-1)
-		exitcode := lua.LNumber(0)
-
-		l.Pop(1)
-
-		if code, ok := luaexitcode.(lua.LNumber); luaexitcode != lua.LNil && ok {
-			exitcode = code
-		}
 		if err != nil {
 			fmt.Fprintln(os.Stderr,
 				"Error in command:\n\n" + err.Error())
@@ -70,7 +62,6 @@ func RunInput(input string) {
 		if cmdArgs[0] != "exit" {
 			HandleHistory(cmdString)
 		}
-		hooks.Em.Emit("command.exit", exitcode)
 		return
 	}