.hilbishrc.lua

@@ -1,21 +1,8 @@
 -- Default Hilbish config
 ansikit = require 'ansikit'
-bait = require 'bait'
 
-function doPrompt(fail)
+prompt(ansikit.text(
-	prompt(ansikit.text(
+	'{blue}%u {cyan}%d {green}∆{reset} '
-		'{blue}%u {cyan}%d ' .. (fail and '{red}' or '{green}') .. '∆{reset} '
+))
-	))
-end
-
-doPrompt()
-
-bait.catch('command.fail', function()
-	doPrompt(true)
-end)
-
-bait.catch('command.success', function()
-	doPrompt()
-end)
 
 --hook("tab complete", function ())

TODO.md

@@ -4,5 +4,5 @@
 - [x] Custom commands via the shell
 - [ ] Confirmed windows support
 - [ ] Readme badges
-- [x] Hooks
+- [ ] Hooks
 - [x] Aliases

golibs/bait/bait.go

@@ -3,33 +3,20 @@ package bait
 import (
 	"github.com/chuckpreslar/emission"
 	"github.com/yuin/gopher-lua"
-	"layeh.com/gopher-luar"
 )
 
-type Bait struct{
+type Bait struct{}
-	Em *emission.Emitter
-}
 
 func New() Bait {
-	return Bait{
+	return Bait{}
-		Em: emission.NewEmitter(),
-	}
 }
 
 func (b *Bait) Loader(L *lua.LState) int {
-	mod := L.SetFuncs(L.NewTable(), map[string]lua.LGFunction{})
+	var exports = map[string]lua.LGFunction{}
-	L.SetField(mod, "throw", luar.New(L, b.throw))
+	mod := L.SetFuncs(L.NewTable(), exports)
-	L.SetField(mod, "catch", luar.New(L, b.catch))
 
 	L.Push(mod)
 
 	return 1
 }
 
-func (b *Bait) throw(name string, args ...interface{}) {
-	b.Em.Emit(name, args...)
-}
-
-func (b *Bait) catch(name string, catcher func(interface{})) {
-	b.Em.On(name, catcher)
-}

main.go

@@ -12,7 +12,6 @@ import (
 	"context"
 	lfs "hilbish/golibs/fs"
 	cmds "hilbish/golibs/commander"
-	hooks "hilbish/golibs/bait"
 
 	"github.com/akamensky/argparse"
 	"github.com/bobappleyard/readline"
@@ -23,7 +22,7 @@ import (
 
 )
 
-const version = "0.2.0"
+const version = "0.2.0-dev"
 var l *lua.LState
 // User's prompt, this will get set when lua side is initialized
 var prompt string
@@ -31,7 +30,6 @@ var prompt string
 var commands = map[string]bool{}
 // Command aliases
 var aliases = map[string]string{}
-var bait hooks.Bait
 
 func main() {
 	parser := argparse.NewParser("hilbish", "A shell for lua and flower lovers")
@@ -60,21 +58,21 @@ func main() {
 	// Set $SHELL if the user wants to
 	if *setshflag { os.Setenv("SHELL", os.Args[0]) }
 
+	// Read config from current directory
+	// (this is assuming the current dir is Hilbish's git)
+	input, err := os.ReadFile(".hilbishrc.lua")
+	if err != nil {
+		// If it wasnt found, go to "real default"
+		input, err = os.ReadFile("/usr/share/hilbish/.hilbishrc.lua")
+		if err != nil {
+			fmt.Println("could not find .hilbishrc.lua or /usr/share/hilbish/.hilbishrc.lua")
+			return
+		}
+	}
+
 	homedir, _ := os.UserHomeDir()
 	// If user's config doesn't exixt,
 	if _, err := os.Stat(homedir + "/.hilbishrc.lua"); os.IsNotExist(err) {
-		// Read default from current directory
-		// (this is assuming the current dir is Hilbish's git)
-		input, err := os.ReadFile(".hilbishrc.lua")
-		if err != nil {
-			// If it wasnt found, go to "real default"
-			input, err = os.ReadFile("/usr/share/hilbish/.hilbishrc.lua")
-			if err != nil {
-				fmt.Println("could not find .hilbishrc.lua or /usr/share/hilbish/.hilbishrc.lua")
-				return
-			}
-		}
-
 		// Create it using either default config we found
 		err = os.WriteFile(homedir + "/.hilbishrc.lua", input, 0644)
 		if err != nil {
@@ -161,15 +159,8 @@ func main() {
 						}
 					}
 				} else {
-					if code, ok := interp.IsExitStatus(err); ok {
-						if code > 0 {
-							bait.Em.Emit("command.fail", code)
-						}
-					}
 					fmt.Fprintln(os.Stderr, err)
 				}
-			} else {
-				bait.Em.Emit("command.success", nil)
 			}
 		}
 	}
@@ -290,9 +281,9 @@ func execCommand(cmd string) error {
 	runner, _ := interp.New(
 		interp.StdIO(os.Stdin, os.Stdout, os.Stderr),
 	)
-	err = runner.Run(context.TODO(), file)
+	runner.Run(context.TODO(), file)
 
-	return err
+	return nil
 }
 
 // do i even have to say
@@ -330,9 +321,6 @@ func LuaInit() {
 
 	l.PreloadModule("commander", commander.Loader)
 
-	bait = hooks.New()
-	l.PreloadModule("bait", bait.Loader)
-
 	// Add more paths that Lua can require from
 	l.DoString("package.path = package.path .. ';./libs/?/init.lua;/usr/share/hilbish/libs/?/init.lua'")