Merge d6eb92f321 into ddf5117fd9

api.go

@@ -37,6 +37,7 @@ import (
 var hshMod *moonlight.Table
 
 func hilbishLoader(mlr *moonlight.Runtime) moonlight.Value {
+	println("hilbish loader called")
 	var exports = map[string]moonlight.Export{
 		"alias": {hlalias, 2, false},
 		"appendPath": {hlappendPath, 1, false},

lua.go

@@ -52,7 +52,7 @@ func luaInit() {
 	*/
 
 	// Add more paths that Lua can require from
-	_, err := l.DoString("package.path = package.path .. " + requirePaths)
+	_, err := l.DoString("print(type(hilbish)); package.path = package.path .. " + requirePaths)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		fmt.Fprintln(os.Stderr, "Could not add Hilbish require paths! Libraries will be missing. This shouldn't happen.")

moonlight/loader_clua.go

@@ -15,7 +15,7 @@ func (mlr *Runtime) LoadLibrary(ldr Loader, name string) {
 	}
 
 	mlr.state.GetGlobal("package")
-	mlr.state.GetField(-1, "preload")
+	mlr.state.GetField(-1, "loaded")
 	mlr.state.PushGoFunction(cluaLoader)
 	mlr.state.SetField(-2, name)
 }

moonlight/table_clua.go

@@ -41,3 +41,7 @@ func ToTable(v Value) *Table {
 func TryTable(v Value) (*Table, bool) {
 	return nil, false
 }
+
+func (t *Table) setRefIdx(mlr *Runtime, i idx) {
+	t.refIdx = mlr.state.Ref(i)
+}

moonlight/util_clua.go

@@ -8,5 +8,6 @@ func (mlr *Runtime) DoString(code string) (Value, error) {
 }
 
 func (mlr *Runtime) DoFile(filename string) error {
-	return mlr.state.DoFile(filename)
+	//return mlr.state.DoFile(filename)
+	return nil
 }

nature/commands/cd.lua

@@ -19,7 +19,7 @@ commander.register('cd', function (args, sinks)
 	dirs.setOld(hilbish.cwd())
 	dirs.push(path)
 
-	local ok, err = pcall(function() fs.cd(path) end)
+	local ok, err = pcall(function() fs.cd(fs.abs(path)) end)
 	if not ok then
 		sinks.out:writeln(err)
 		return 1

nature/opts/tips.lua

@@ -27,7 +27,7 @@ hilbish.tips = {
 }
 
 bait.catch('hilbish.init', function()
-	if hilbish.interactive and hilbish.opts.tip then
+	if hilbish.interactive and hilbish.opts.tips then
 		local idx = math.random(1, #hilbish.tips)
 		print(lunacolors.format(PREAMBLE .. "\nTip: " .. hilbish.tips[idx]))
 	end

vars.go

@@ -11,7 +11,7 @@ var (
 
 // Version info
 var (
-	ver = "v2.3.0"
+	ver = "v2.3.1"
 	releaseName = "Alyssum"
 
 	gitCommit string