hilbish.go

@@ -14,7 +14,6 @@ import (
 var exports = map[string]lua.LGFunction {
 	"run": run,
 	"flag": flag,
-	"cwd": cwd,
 }
 
 func HilbishLoader(L *lua.LState) int {
@@ -54,12 +53,3 @@ func flag(L *lua.LState) int {
 
 	return 1
 }
-
-func cwd(L *lua.LState) int {
-	cwd, _ := os.Getwd()
-
-	L.Push(lua.LString(cwd))
-
-	return 1
-}
-

lua.go

@@ -12,7 +12,6 @@ import (
 	"hilbish/golibs/fs"
 
 	"github.com/yuin/gopher-lua"
-	"layeh.com/gopher-luar"
 )
 
 var minimalconf = `
@@ -31,7 +30,6 @@ func LuaInit() {
 	l.SetGlobal("alias", l.NewFunction(hshalias))
 	l.SetGlobal("appendPath", l.NewFunction(hshappendPath))
 	l.SetGlobal("exec", l.NewFunction(hshexec))
-	l.SetGlobal("goro", luar.New(l, hshgoroutine))
 
 	// yes this is stupid, i know
 	l.PreloadModule("hilbish", HilbishLoader)
@@ -153,7 +151,3 @@ func hshexec(L *lua.LState) int {
 	syscall.Exec(cmdPath, cmdArgs, os.Environ())
 	return 0 // random thought: does this ever return?
 }
-
-func hshgoroutine(gofunc func()) {
-	go gofunc()
-}

preload.lua

@@ -3,7 +3,6 @@
 local fs = require 'fs'
 local commander = require 'commander'
 local bait = require 'bait'
-local old_dir = hilbish.cwd()
 
 -- Builtins
 commander.register('cd', function (args)
@@ -14,13 +13,7 @@ commander.register('cd', function (args)
 			path = path .. tostring(args[i]) .. ' '
 		end
 		path = path:gsub('$%$','\0'):gsub('${([%w_]+)}', os.getenv)
-		:gsub('$([%w_]+)', os.getenv):gsub('%z','$'):gsub("%s+", "")
+		:gsub('$([%w_]+)', os.getenv):gsub('%z','$')
-
-        if path == '-' then
-            path = old_dir
-            print(path)
-        end
-        old_dir = hilbish.cwd()
 
 		local ok, err = pcall(function() fs.cd(path) end)
 		if not ok then