mirror of
https://github.com/Hilbis/Hilbish
synced 2025-07-01 08:42:04 +00:00
chore: merge from 3.0 branch
This commit is contained in:
commit
548de98551
1
api.go
1
api.go
@ -104,7 +104,6 @@ func hilbishLoad(rtm *rt.Runtime) (rt.Value, func()) {
|
|||||||
// hilbish.completion table
|
// hilbish.completion table
|
||||||
hshcomp := completionLoader(rtm)
|
hshcomp := completionLoader(rtm)
|
||||||
// TODO: REMOVE "completion" AND ONLY USE "completions" WITH AN S
|
// 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))
|
mod.Set(rt.StringValue("completions"), rt.TableValue(hshcomp))
|
||||||
|
|
||||||
// hilbish.runner table
|
// hilbish.runner table
|
||||||
|
10
nature/env.lua
Normal file
10
nature/env.lua
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
env = {}
|
||||||
|
|
||||||
|
setmetatable(env, {
|
||||||
|
__index = function(_, k)
|
||||||
|
return os.getenv(k)
|
||||||
|
end,
|
||||||
|
__newindex = function(_, k, v)
|
||||||
|
os.setenv(k, tostring(v))
|
||||||
|
end
|
||||||
|
})
|
@ -27,6 +27,7 @@ require 'nature.opts'
|
|||||||
require 'nature.vim'
|
require 'nature.vim'
|
||||||
require 'nature.runner'
|
require 'nature.runner'
|
||||||
require 'nature.hummingbird'
|
require 'nature.hummingbird'
|
||||||
|
require 'nature.env'
|
||||||
require 'nature.abbr'
|
require 'nature.abbr'
|
||||||
require 'nature.editor'
|
require 'nature.editor'
|
||||||
|
|
||||||
@ -37,36 +38,6 @@ else
|
|||||||
os.setenv('SHLVL', '0')
|
os.setenv('SHLVL', '0')
|
||||||
end
|
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
|
do
|
||||||
local startSearchPath = hilbish.userDir.data .. '/hilbish/start/?/init.lua;'
|
local startSearchPath = hilbish.userDir.data .. '/hilbish/start/?/init.lua;'
|
||||||
.. hilbish.userDir.data .. '/hilbish/start/?.lua'
|
.. hilbish.userDir.data .. '/hilbish/start/?.lua'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user