Makefile

@@ -10,7 +10,7 @@ install:
 	@install -v -d "$(DESTDIR)$(BINDIR)/" && install -m 0755 -v hilbish "$(DESTDIR)$(BINDIR)/hilbish"
 	@mkdir -p "$(DESTDIR)$(LIBDIR)"
 	@cp libs preload.lua .hilbishrc.lua "$(DESTDIR)$(LIBDIR)" -r
-	@grep "$(DESTDIR)$(BINDIR)/hilbish" -qxF /etc/shells || echo "$(DESTDIR)$(BINDIR)/hilbish" >> /etc/shells
+	@echo "$(DESTDIR)$(BINDIR)/hilbish" >> /etc/shells
 	@echo "Hilbish Installed"
 
 uninstall:

golibs/fs/fs.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"strings"
 
-	lua "github.com/yuin/gopher-lua"
+	"github.com/yuin/gopher-lua"
-	luar "layeh.com/gopher-luar"
+	"layeh.com/gopher-luar"
 )
 
 func Loader(L *lua.LState) int {
@@ -15,6 +15,7 @@ func Loader(L *lua.LState) int {
     return 1
 }
 
+
 func LuaErr(L *lua.LState, code int) {
 	// TODO: Error with a table, with path and error code
 	L.Error(lua.LNumber(code), 2)

lua.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"fmt"
-	"hilbish/golibs/bait"
+	hooks "hilbish/golibs/bait"
-	"hilbish/golibs/commander"
+	cmds "hilbish/golibs/commander"
-	"hilbish/golibs/fs"
+	lfs "hilbish/golibs/fs"
 	"os"
 
 	"github.com/yuin/gopher-lua"
@@ -27,14 +27,13 @@ func LuaInit(confpath string) {
 	l.SetGlobal("prompt", l.NewFunction(hshprompt))
 	l.SetGlobal("multiprompt", l.NewFunction(hshmlprompt))
 	l.SetGlobal("alias", l.NewFunction(hshalias))
-	l.SetGlobal("appendPath", l.NewFunction(hshappendPath))
 
 	// Add fs module to Lua
-	l.PreloadModule("fs", fs.Loader)
+	l.PreloadModule("fs", lfs.Loader)
 
-	cmds := commander.New()
+	commander := cmds.New()
 	// When a command from Lua is added, register it for use
-	cmds.Events.On("commandRegister",
+	commander.Events.On("commandRegister",
 		func(cmdName string, cmd *lua.LFunction) {
 			commands[cmdName] = true
 			l.SetField(
@@ -44,10 +43,10 @@ func LuaInit(confpath string) {
 				cmd)
 		})
 
-	l.PreloadModule("commander", cmds.Loader)
+	l.PreloadModule("commander", commander.Loader)
 
-	hooks = bait.New()
+	bait = hooks.New()
-	l.PreloadModule("bait", hooks.Loader)
+	l.PreloadModule("bait", bait.Loader)
 
 	// Add more paths that Lua can require from
 	l.DoString(`package.path = package.path
@@ -68,9 +67,7 @@ func LuaInit(confpath string) {
 	}
 
 	// Run config
-	if !interactive {
+	if !interactive { return }
-		return
-	}
 	err = l.DoFile(confpath)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err,
@@ -100,11 +97,3 @@ func hshalias(L *lua.LState) int {
 
 	return 1
 }
-
-func hshappendPath(L *lua.LState) int {
-	path := L.ToString(1)
-
-	os.Setenv("PATH", os.Getenv("PATH") + ":" + path)
-
-	return 0
-}

main.go

@@ -8,7 +8,7 @@ import (
 	"os/user"
 	"strings"
 
-	"hilbish/golibs/bait"
+	hooks "hilbish/golibs/bait"
 
 	"github.com/akamensky/argparse"
 	"github.com/bobappleyard/readline"
@@ -28,7 +28,7 @@ var (
 	commands = map[string]bool{}
 	aliases = map[string]string{}
 
-	hooks bait.Bait
+	bait hooks.Bait
 	homedir string
 	running bool
 	interactive bool

shell.go

@@ -8,8 +8,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/bobappleyard/readline"
 	"github.com/yuin/gopher-lua"
+	"github.com/bobappleyard/readline"
 	"layeh.com/gopher-luar"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
@@ -23,7 +23,7 @@ func RunInput(input string) {
 		// If it succeeds, add to history and prompt again
 		HandleHistory(input)
 
-		hooks.Em.Emit("command.exit", 0)
+		bait.Em.Emit("command.exit", 0)
 		return
 	}
 
@@ -71,22 +71,22 @@ func RunInput(input string) {
 				if syntax.IsIncomplete(err) || strings.HasSuffix(input, "\\") {
 					continue
 				} else if code, ok := interp.IsExitStatus(err); ok {
-					hooks.Em.Emit("command.exit", code)
+					bait.Em.Emit("command.exit", code)
 				} else if err != nil {
 					fmt.Fprintln(os.Stderr, err)
-					hooks.Em.Emit("command.exit", 1)
+					bait.Em.Emit("command.exit", 1)
 				}
 				break
 			}
 		} else {
 			if code, ok := interp.IsExitStatus(err); ok {
-				hooks.Em.Emit("command.exit", code)
+				bait.Em.Emit("command.exit", code)
 			} else {
 				fmt.Fprintln(os.Stderr, err)
 			}
 		}
 	} else {
-		hooks.Em.Emit("command.exit", 0)
+		bait.Em.Emit("command.exit", 0)
 	}
 	HandleHistory(cmdString)
 }
@@ -167,9 +167,7 @@ func HandleHistory(cmd string) {
 func StartMultiline(prev string, sb *strings.Builder) bool {
 	// sb fromt outside is passed so we can
 	// save input from previous prompts
-	if sb.String() == "" {
+	if sb.String() == "" { sb.WriteString(prev + " ") }
-		sb.WriteString(prev + " ")
-	}
 
 	fmt.Print(multilinePrompt)