api.go

@@ -104,6 +104,7 @@ func hilbishLoad(rtm *rt.Runtime) (rt.Value, func()) {
 	// hilbish.completion table
 	hshcomp := completionLoader(rtm)
 	// TODO: REMOVE "completion" AND ONLY USE "completions" WITH AN S
+	mod.Set(rt.StringValue("completion"), rt.TableValue(hshcomp))
 	mod.Set(rt.StringValue("completions"), rt.TableValue(hshcomp))
 
 	// hilbish.runner table

nature/env.lua

@@ -1,10 +0,0 @@
-env = {}
-
-setmetatable(env, {
-	__index = function(_, k)
-		return os.getenv(k)
-	end,
-	__newindex = function(_, k, v)
-		os.setenv(k, tostring(v))
-	end
-})

nature/init.lua

@@ -27,7 +27,6 @@ require 'nature.opts'
 require 'nature.vim'
 require 'nature.runner'
 require 'nature.hummingbird'
-require 'nature.env'
 require 'nature.abbr'
 require 'nature.editor'
 
@@ -38,6 +37,36 @@ else
 	os.setenv('SHLVL', '0')
 end
 
+do
+	local virt_G = { }
+
+	setmetatable(_G, {
+		__index = function (_, key)
+			local got_virt = virt_G[key]
+			if got_virt ~= nil then
+				return got_virt
+			end
+
+			if type(key) == 'string' then
+				virt_G[key] = os.getenv(key)
+			end
+			return virt_G[key]
+		end,
+
+		__newindex = function (_, key, value)
+			if type(value) == 'string' then
+				os.setenv(key, value)
+				virt_G[key] = value
+			else
+				if type(virt_G[key]) == 'string' then
+					os.setenv(key, '')
+				end
+				virt_G[key] = value
+			end
+		end,
+	})
+end
+
 do
 	local startSearchPath = hilbish.userDir.data .. '/hilbish/start/?/init.lua;'
 	.. hilbish.userDir.data .. '/hilbish/start/?.lua'

vars.go

@@ -2,16 +2,16 @@ package main
 
 // String vars that are free to be changed at compile time
 var (
-	defaultHistDir     = ""
+	defaultHistDir = ""
 	commonRequirePaths = "';./libs/?/init.lua;./?/init.lua;./?/?.lua'"
 
-	prompt          string
+	prompt string
 	multilinePrompt = "> "
 )
 
 // Version info
 var (
-	ver         = "v3.0.0"
+	ver = "v2.4.0"
 	releaseName = "Moonflower"
 
 	gitCommit string
@@ -20,9 +20,10 @@ var (
 
 // Flags
 var (
-	running     bool // Is a command currently running
+	running bool // Is a command currently running
 	interactive bool
-	login       bool // Are we the login shell?
+	login bool // Are we the login shell?
-	noexecute   bool // Should we run Lua or only report syntax errors
+	noexecute bool // Should we run Lua or only report syntax errors
 	initialized bool
 )
+