chore: merge from dev

hilbish.go

@@ -5,6 +5,7 @@ package main
 
 import (
 	"os"
+	"strings"
 
 	"github.com/pborman/getopt"
 	"github.com/yuin/gopher-lua"
@@ -21,9 +22,10 @@ func HilbishLoader(L *lua.LState) int {
 	mod := L.SetFuncs(L.NewTable(), exports)
 
 	host, _ := os.Hostname()
+	username := strings.Split(curuser.Username, "\\")[1] // for some reason Username includes the hostname on windows
 
 	L.SetField(mod, "ver", lua.LString(version))
-	L.SetField(mod, "user", lua.LString(curuser.Username))
+	L.SetField(mod, "user", lua.LString(username))
 	L.SetField(mod, "host", lua.LString(host))
 	L.SetField(mod, "home", lua.LString(homedir))
 

main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"bufio"
+	"context"
 	"fmt"
 	"io"
 	"os"
@@ -9,12 +10,14 @@ import (
 	"os/signal"
 	"os/user"
 	"path/filepath"
+	"time"
 
 	"hilbish/golibs/bait"
 
 	"github.com/pborman/getopt"
 	"github.com/yuin/gopher-lua"
 	"layeh.com/gopher-luar"
+	"mvdan.cc/sh/v3/interp"
 	"golang.org/x/term"
 )
 
@@ -30,11 +33,15 @@ var (
 
 	hooks bait.Bait
 	defaultConfPath string
+
+	runner *interp.Runner	
 )
 
 func main() {
 	homedir, _ = os.UserHomeDir()
 	curuser, _ = user.Current()
+	preloadPath = strings.Replace(preloadPath, "~", homedir, 1)
+	sampleConfPath = strings.Replace(sampleConfPath, "~", homedir, 1)
 
 	if defaultConfDir == "" {
 		// we'll add *our* default if its empty (wont be if its changed comptime)
@@ -146,6 +153,56 @@ func main() {
 		os.Exit(0)
 	}
 
+	// Execute handler for sh runner
+	exechandle := func(ctx context.Context, args []string) error {
+		hc := interp.HandlerCtx(ctx)
+		_, argstring := splitInput(strings.Join(args, " "))
+
+		// If alias was found, use command alias
+		if aliases[args[0]] != "" {
+			alias := aliases[args[0]]
+			argstring = alias + strings.TrimPrefix(argstring, args[0])
+			cmdArgs, _ := splitInput(argstring)
+			args = cmdArgs
+		}
+
+		// If command is defined in Lua then run it
+		if commands[args[0]] != nil {
+			err := l.CallByParam(lua.P{
+				Fn: commands[args[0]],
+				NRet:    1,
+				Protect: true,
+			}, luar.New(l, args[1:]))
+			luaexitcode := l.Get(-1)
+			var exitcode uint8 = 0
+
+			l.Pop(1)
+
+			if code, ok := luaexitcode.(lua.LNumber); luaexitcode != lua.LNil && ok {
+				exitcode = uint8(code)
+			}
+
+			if err != nil {
+				fmt.Fprintln(os.Stderr,
+					"Error in command:\n\n" + err.Error())
+			}
+			hooks.Em.Emit("command.exit", exitcode)
+			return interp.NewExitStatus(exitcode)
+		}
+
+		if _, err := interp.LookPathDir(hc.Dir, hc.Env, args[0]); err != nil {
+			hooks.Em.Emit("command.not-found", args[0])
+			return interp.NewExitStatus(127)
+		}
+
+		return interp.DefaultExecHandler(2 * time.Second)(ctx, args)
+	}
+	// Setup sh runner outside of input label
+	runner, _ = interp.New(
+		interp.StdIO(os.Stdin, os.Stdout, os.Stderr),
+		interp.ExecHandler(exechandle),
+	)
+
 input:
 	for interactive {
 		running = false
@@ -208,12 +265,13 @@ func fmtPrompt() string {
 	cwd, _ := os.Getwd()
 
 	cwd = strings.Replace(cwd, curuser.HomeDir, "~", 1)
+	username := strings.Split(curuser.Username, "\\")[1] // for some reason Username includes the hostname on windows
 
 	args := []string{
 		"d", cwd,
 		"D", filepath.Base(cwd),
 		"h", host,
-		"u", curuser.Username,
+		"u", username,
 	}
 
 	for i, v := range args {

shell.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"time"
 
 //	"github.com/bobappleyard/readline"
 	"github.com/yuin/gopher-lua"
@@ -114,54 +113,7 @@ func execCommand(cmd string) error {
 	if err != nil {
 		return err
 	}
-
+	
-	exechandle := func(ctx context.Context, args []string) error {
-		hc := interp.HandlerCtx(ctx)
-		_, argstring := splitInput(strings.Join(args, " "))
-
-		// If alias was found, use command alias
-		if aliases[args[0]] != "" {
-			alias := aliases[args[0]]
-			argstring = alias + strings.TrimPrefix(argstring, args[0])
-			cmdArgs, _ := splitInput(argstring)
-			args = cmdArgs
-		}
-
-		// If command is defined in Lua then run it
-		if commands[args[0]] != nil {
-			err := l.CallByParam(lua.P{
-				Fn: commands[args[0]],
-				NRet:    1,
-				Protect: true,
-			}, luar.New(l, args[1:]))
-			luaexitcode := l.Get(-1)
-			var exitcode uint8 = 0
-
-			l.Pop(1)
-
-			if code, ok := luaexitcode.(lua.LNumber); luaexitcode != lua.LNil && ok {
-				exitcode = uint8(code)
-			}
-
-			if err != nil {
-				fmt.Fprintln(os.Stderr,
-					"Error in command:\n\n" + err.Error())
-			}
-			hooks.Em.Emit("command.exit", exitcode)
-			return interp.NewExitStatus(exitcode)
-		}
-
-		if _, err := interp.LookPathDir(hc.Dir, hc.Env, args[0]); err != nil {
-			hooks.Em.Emit("command.not-found", args[0])
-			return interp.NewExitStatus(127)
-		}
-
-		return interp.DefaultExecHandler(2 * time.Second)(ctx, args)
-	}
-	runner, _ := interp.New(
-		interp.StdIO(os.Stdin, os.Stdout, os.Stderr),
-		interp.ExecHandler(exechandle),
-	)
 	err = runner.Run(context.TODO(), file)
 
 	return err

vars.go

@@ -3,18 +3,7 @@ package main
 // String vars that are free to be changed at compile time
 var (
 	version = "v0.5.1"
-	requirePaths = `';./libs/?/init.lua;./?/init.lua;./?/?.lua'
-	.. ';/usr/share/hilbish/libs/?/init.lua;'
-	.. ';/usr/share/hilbish/libs/?/?.lua;'
-	.. hilbish.home .. '/.local/share/hilbish/libs/?/init.lua;'
-	.. hilbish.home	.. '/.local/share/hilbish/libs/?/?.lua;'
-	.. hilbish.home	.. '/.local/share/hilbish/libs/?.lua'
-	.. hilbish.home	.. '/.config/hilbish/?/init.lua'
-	.. hilbish.home	.. '/.config/hilbish/?/?.lua'
-	.. hilbish.home	.. '/.config/hilbish/?.lua'`
-	preloadPath = "/usr/share/hilbish/preload.lua"
 	defaultConfDir = "" // ~ will be substituted for home, path for user's default config
-	sampleConfPath = "/usr/share/hilbish/.hilbishrc.lua" // Path to default/sample config
 
 	prompt string // Prompt will always get changed anyway
 	multilinePrompt = "> "

vars_linux.go

@@ -0,0 +1,18 @@
+// +build linux
+
+package main
+
+// String vars that are free to be changed at compile time
+var (
+	requirePaths = `';./libs/?/init.lua;./?/init.lua;./?/?.lua'
+	.. ';/usr/share/hilbish/libs/?/init.lua;'
+	.. ';/usr/share/hilbish/libs/?/?.lua;'
+	.. hilbish.home .. '/.local/share/hilbish/libs/?/init.lua;'
+	.. hilbish.home	.. '/.local/share/hilbish/libs/?/?.lua;'
+	.. hilbish.home	.. '/.local/share/hilbish/libs/?.lua'
+	.. hilbish.home	.. '/.config/hilbish/?/init.lua'
+	.. hilbish.home	.. '/.config/hilbish/?/?.lua'
+	.. hilbish.home	.. '/.config/hilbish/?.lua'`
+	preloadPath = "/usr/share/hilbish/preload.lua"
+	sampleConfPath = "/usr/share/hilbish/.hilbishrc.lua" // Path to default/sample config
+)

vars_windows.go

@@ -0,0 +1,12 @@
+// +build windows
+
+package main
+
+// String vars that are free to be changed at compile time
+var (
+	requirePaths = `';./libs/?/init.lua;./?/init.lua;./?/?.lua'
+	.. hilbish.home .. '\\Appdata\\Roaming\\Hilbish\\libs\\?\\init.lua;'
+	.. hilbish.home .. '\\Appdata\\Roaming\\Hilbish\\libs\\?\\?.lua;'`
+	preloadPath = "~\\Appdata\\Roaming\\Hilbish\\preload.lua" // ~ and \ gonna cry?
+	sampleConfPath = "~\\Appdata\\Roaming\\Hilbish\\hilbishrc.lua" // Path to default/sample config
+)