Makefile

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

cmd/docgen/docgen.go

@@ -72,7 +72,7 @@ func main() {
 
 	for mod, v := range docs {
 		if mod == "main" { mod = "global" }
-		os.Mkdir("docs", 0777)
+		os.Mkdir("docs", 0744)
 		f, _ := os.Create("docs/" + mod + ".txt")
 		f.WriteString(strings.Join(v, "\n") + "\n")
 	}

docs/bait.txt

@@ -1,4 +0,0 @@
-catch(name, cb) > Catches a hook with `name`. Runs the `cb` when it is thrown
-
-throw(name, ...args) > Throws a hook with `name` with the provided `args`
-

docs/commander.txt

@@ -1,4 +0,0 @@
-deregister(name) > Deregisters any command registered with `name`
-
-register(name, cb) > Register a command with `name` that runs `cb` when ran
-

docs/fs.txt

@@ -1,8 +0,0 @@
-cd(dir) > Changes directory to `dir`
-
-mkdir(name, recursive) > Makes a directory called `name`. If `recursive` is true, it will create its parent directories.
-
-readdir(dir) > Returns a table of files in `dir`
-
-stat(path) > Returns info about `path`
-

docs/global.txt

@@ -1,21 +0,0 @@
-alias(cmd, orig) > Sets an alias of `orig` to `cmd`
-
-appendPath(dir) > Appends `dir` to $PATH
-
-exec(cmd) > Replaces running hilbish with `cmd`
-
-goro(fn) > Puts `fn` in a goroutine
-
-interval(cb, time) > Runs the `cb` function every `time` milliseconds
-
-multiprompt(str) > Changes the continued line prompt to `str`
-
- prompt(str) > Changes the shell prompt to `str`
-There are a few verbs that can be used in the prompt text.
-These will be formatted and replaced with the appropriate values.
-`%d` - Current working directory
-`%u` - Name of current user
-`%h` - Hostname of device
-
-timeout(cb, time) > Runs the `cb` function after `time` in milliseconds
-

docs/hilbish.txt

@@ -1,6 +0,0 @@
-cwd() > Returns the current directory of the shell
-
-flag(f) > Checks if the `f` flag has been passed to Hilbish.
-
-run(cmd) > Runs `cmd` in Hilbish's sh interpreter
-

golibs/bait/bait.go

@@ -23,12 +23,8 @@ func (b *Bait) Loader(L *lua.LState) int {
 	L.SetField(mod, "throw", luar.New(L, b.bthrow))
 	L.SetField(mod, "catch", luar.New(L, b.bcatch))
 
-	util.Document(L, mod, `Bait is the event emitter for Hilbish. Why name it bait?
+	util.Document(L, mod, `Bait is the event emitter for Hilbish. Why name it bait? Because it throws hooks that you can catch. (emits events that you can listen to) and because why not, fun naming is fun.
-Because it throws hooks that you can catch
+This is what you will use if you want to listen in on hooks to know when certain things have happened, like when you've changed directory, a command has failed, etc.`)
-(emits events that you can listen to) and because why not,
-fun naming is fun. This is what you will use if you want to
-listen in on hooks to know when certain things have happened,
-like when you've changed directory, a command has failed, etc.`)
 	L.Push(mod)
 
 	return 1

golibs/fs/fs.go

@@ -3,6 +3,7 @@
 package fs
 
 import (
+	"fmt"
 	"os"
 	"strings"
 
@@ -14,23 +15,22 @@ import (
 func Loader(L *lua.LState) int {
 	mod := L.SetFuncs(L.NewTable(), exports)
 
-	util.Document(L, mod, `The fs module provides easy and simple access to
+	util.Document(L, mod, `The fs module provides easy and simple access to filesystem functions and other
-filesystem functions and other things, and acts an
+things, and acts an addition to the Lua standard library's I/O and fs functions.`)
-addition to the Lua standard library's I/O and fs functions.`)
 
 	L.Push(mod)
 	return 1
 }
 
-func luaErr(L *lua.LState, msg string) {
+func luaErr(L *lua.LState, code int) {
-	L.Error(lua.LString(msg), 2)
+	// TODO: Error with a table, with path and error code
+	L.Error(lua.LNumber(code), 2)
 }
 
 var exports = map[string]lua.LGFunction{
 	"cd": fcd,
 	"mkdir": fmkdir,
 	"stat": fstat,
-	"readdir": freaddir,
 }
 
 // cd(dir)
@@ -40,8 +40,16 @@ func fcd(L *lua.LState) int {
 
 	err := os.Chdir(strings.TrimSpace(path))
 	if err != nil {
-		e := err.(*os.PathError).Err.Error()
+		switch e := err.(*os.PathError).Err.Error(); e {
-		luaErr(L, e)
+		case "no such file or directory":
+			luaErr(L, 1)
+		case "not a directory":
+			luaErr(L, 2)
+		default:
+			fmt.Printf("Found unhandled error case: %s\n", e)
+			fmt.Printf("Report this at https://github.com/Rosettea/Hilbish/issues with the title being: \"fs: unhandled error case %s\", and show what caused it.\n", e)
+			luaErr(L, 213)
+		}
 	}
 
 	return 0
@@ -53,15 +61,12 @@ func fmkdir(L *lua.LState) int {
 	dirname := L.CheckString(1)
 	recursive := L.ToBool(2)
 	path := strings.TrimSpace(dirname)
-	var err error
 
+	// TODO: handle error here
 	if recursive {
-		err = os.MkdirAll(path, 0744)
+		os.MkdirAll(path, 0744)
 	} else {
-		err = os.Mkdir(path, 0744)
+		os.Mkdir(path, 0744)
-	}
-	if err != nil {
-		luaErr(L, err.Error())
 	}
 
 	return 0
@@ -73,32 +78,8 @@ func fstat(L *lua.LState) int {
 	path := L.CheckString(1)
 
 	// TODO: handle error here
-	pathinfo, err := os.Stat(path)
+	pathinfo, _ := os.Stat(path)
-	if err != nil {
-		luaErr(L, err.Error())
-		return 0
-	}
 	L.Push(luar.New(L, pathinfo))
 
 	return 1
 }
-
-// readdir(dir)
-// Returns a table of files in `dir`
-func freaddir(L *lua.LState) int {
-	dir := L.CheckString(1)
-	names := []string{}
-
-	dirEntries, err := os.ReadDir(dir)
-	if err != nil {
-		luaErr(L, err.Error())
-		return 0
-	}
-	for _, entry := range dirEntries {
-		names = append(names, entry.Name())
-	}
-
-	L.Push(luar.New(L, names))
-
-	return 1
-}

hilbish.go

@@ -8,8 +8,6 @@ import (
 	"runtime"
 	"strings"
 
-	"hilbish/util"
-
 	"github.com/pborman/getopt"
 	"github.com/yuin/gopher-lua"
 	"mvdan.cc/sh/v3/interp"
@@ -31,17 +29,16 @@ func HilbishLoader(L *lua.LState) int {
 		username = strings.Split(username, "\\")[1] // for some reason Username includes the hostname on windows
 	}
 
-	L.SetField(mod, "ver", lua.LString(version))
+	setField(L, mod, "ver", lua.LString(version), "The version of Hilbish")
-	L.SetField(mod, "user", lua.LString(username))
+	setField(L, mod, "user", lua.LString(username), "Current user's username")
-	L.SetField(mod, "host", lua.LString(host))
+	setField(L, mod, "host", lua.LString(host), "Hostname of the system")
-	L.SetField(mod, "home", lua.LString(homedir))
+	setField(L, mod, "home", lua.LString(homedir), "Path of home directory")
 
 	xdg := L.NewTable()
-	L.SetField(xdg, "config", lua.LString(confDir))
+	setField(L, xdg, "config", lua.LString(confDir), "XDG config directory")
-	L.SetField(xdg, "data", lua.LString(getenv("XDG_DATA_HOME", homedir + "/.local/share/")))
+	setField(L, xdg, "data", lua.LString(getenv("XDG_DATA_HOME", homedir + "/.local/share/")), "XDG data directory")
-	L.SetField(mod, "xdg", xdg)
+	setField(L, mod, "xdg", xdg, "XDG values for Linux")
 
-	util.Document(L, mod, "A miscellaneous sort of \"core\" API for things that relate to the shell itself and others.")
 	L.Push(mod)
 
 	return 1

lua.go

@@ -8,6 +8,7 @@ import (
 	"syscall"
 	"time"
 
+	"hilbish/util"
 	"hilbish/golibs/bait"
 	"hilbish/golibs/commander"
 	"hilbish/golibs/fs"
@@ -95,6 +96,13 @@ func RunLogin() {
 	}
 }
 
+func setField(L *lua.LState, module lua.LValue, name string, val lua.LValue, doc string) {
+	if val.Type() == lua.LTTable {
+		util.Document(L, module, doc)
+   }
+	L.SetField(module, name, val)
+}
+
 /* prompt(str)
 Changes the shell prompt to `str`
 There are a few verbs that can be used in the prompt text.

preload.lua

@@ -44,57 +44,6 @@ commander.register('exit', function()
 	os.exit(0)
 end)
 
-commander.register('doc', function(args)
-	local moddocPath = hilbish.dataDir .. '/docs/'
-	local globalDesc = [[
-These are the global Hilbish functions that are always available and not part of a module.]]
-	if #args > 0 then
-		local mod = ''
-		for i = 1, #args do
-			mod = mod .. tostring(args[i]) .. ' '
-		end
-		mod = mod:gsub('^%s*(.-)%s*$', '%1')
-
-		local f = io.open(moddocPath .. mod .. '.txt', 'rb')
-		if not f then 
-			print('Could not find docs for module named ' .. mod .. '.')
-			return 1
-		end
-
-		local desc = (mod == 'global' and globalDesc or getmetatable(require(mod)).__doc)
-		local funcdocs = f:read '*a'
-		local backtickOccurence = 0
-		print(desc .. '\n\n' .. lunacolors.format(funcdocs:sub(1, #funcdocs - 1):gsub('`', function()
-			backtickOccurence = backtickOccurence + 1
-			if backtickOccurence % 2 == 0 then
-				return '{reset}'
-			else
-				return '{invert}'
-			end
-		end)))
-		f:close()
-
-		return
-	end
-	local modules = fs.readdir(moddocPath)
-
-	io.write [[
-Welcome to Hilbish's doc tool! Here you can find documentation for builtin
-functions and other things.
-
-Usage: doc <module>
-
-Available modules: ]]
-
-	local mods = ''
-	for i = 1, #modules do
-		mods = mods .. tostring(modules[i]):gsub('.txt', '') .. ', '
-	end
-	print(mods)
-
-	return
-end)
-
 do
 	local virt_G = { }