mirror of
https://github.com/Hilbis/Hilbish
synced 2025-04-21 21:13:22 +00:00
Compare commits
3 Commits
762066022d
...
95391d74f6
Author | SHA1 | Date | |
---|---|---|---|
95391d74f6 | |||
7e0812e77a | |||
40d3933009 |
@ -25,6 +25,7 @@ local function doNotifyPrompt()
|
||||
end
|
||||
|
||||
doPrompt()
|
||||
--[[
|
||||
|
||||
bait.catch('command.preexec', function()
|
||||
running = true
|
||||
@ -47,3 +48,4 @@ end)
|
||||
bait.catch('hilbish.notification', function(notif)
|
||||
doNotifyPrompt()
|
||||
end)
|
||||
]]--
|
||||
|
9
api.go
9
api.go
@ -51,7 +51,9 @@ func hilbishLoader(mlr *moonlight.Runtime) moonlight.Value {
|
||||
"hinter": {hlhinter, 1, false},
|
||||
"multiprompt": {hlmultiprompt, 1, false},
|
||||
"prependPath": {hlprependPath, 1, false},
|
||||
*/
|
||||
"prompt": {hlprompt, 1, true},
|
||||
/*
|
||||
"inputMode": {hlinputMode, 1, false},
|
||||
"interval": {hlinterval, 2, false},
|
||||
"read": {hlread, 1, false},
|
||||
@ -80,6 +82,7 @@ func hilbishLoader(mlr *moonlight.Runtime) moonlight.Value {
|
||||
hshMod.SetField("interactive", moonlight.BoolValue(interactive))
|
||||
hshMod.SetField("login", moonlight.BoolValue(login))
|
||||
hshMod.SetField("exitCode", moonlight.IntValue(0))
|
||||
hshMod.SetField("midnightEdition", moonlight.BoolValue(moonlight.IsMidnight()))
|
||||
//util.SetField(rtm, mod, "vimMode", rt.NilValue)
|
||||
|
||||
// hilbish.userDir table
|
||||
@ -130,8 +133,10 @@ func hilbishLoader(mlr *moonlight.Runtime) moonlight.Value {
|
||||
//mod.Set(rt.StringValue("version"), rt.TableValue(versionModule))
|
||||
|
||||
// very meta
|
||||
//moduleModule := moduleLoader(mlr)
|
||||
//hshMod.SetField("module", moonlight.TableValue(moduleModule))
|
||||
if moonlight.IsMidnight() {
|
||||
moduleModule := moduleLoader(mlr)
|
||||
hshMod.SetField("module", moonlight.TableValue(moduleModule))
|
||||
}
|
||||
|
||||
return moonlight.TableValue(hshMod)
|
||||
}
|
||||
|
3
main.go
3
main.go
@ -339,6 +339,9 @@ func getVersion() string {
|
||||
}
|
||||
|
||||
v.WriteString(" (" + releaseName + ")")
|
||||
if moonlight.IsMidnight() {
|
||||
v.WriteString(" (Midnight Edition)")
|
||||
}
|
||||
|
||||
return v.String()
|
||||
}
|
||||
|
6
moonlight/midnight_clua.go
Normal file
6
moonlight/midnight_clua.go
Normal file
@ -0,0 +1,6 @@
|
||||
//go:build midnight
|
||||
package moonlight
|
||||
|
||||
func IsMidnight() bool {
|
||||
return true
|
||||
}
|
6
moonlight/midnight_golua.go
Normal file
6
moonlight/midnight_golua.go
Normal file
@ -0,0 +1,6 @@
|
||||
//go:build !midnight
|
||||
package moonlight
|
||||
|
||||
func IsMidnight() bool {
|
||||
return false
|
||||
}
|
@ -41,7 +41,7 @@ func TableValue(t *Table) Value {
|
||||
}
|
||||
|
||||
func FunctionValue(f Callable) Value {
|
||||
return NilValue
|
||||
return Value{iface: f}
|
||||
}
|
||||
|
||||
func AsValue(i interface{}) Value {
|
||||
|
@ -1,22 +1,25 @@
|
||||
-- Prelude initializes everything else for our shell
|
||||
--[[
|
||||
local _ = require 'succulent' -- Function additions
|
||||
local bait = require 'bait'
|
||||
local fs = require 'fs'
|
||||
--local fs = require 'fs'
|
||||
|
||||
package.path = package.path .. ';' .. hilbish.dataDir .. '/?/init.lua'
|
||||
.. ';' .. hilbish.dataDir .. '/?/?.lua' .. ";" .. hilbish.dataDir .. '/?.lua'
|
||||
|
||||
hilbish.module.paths = '?.so;?/?.so;'
|
||||
.. hilbish.userDir.data .. 'hilbish/libs/?/?.so'
|
||||
.. ";" .. hilbish.userDir.data .. 'hilbish/libs/?.so'
|
||||
if not hilbish.midnightEdition then
|
||||
hilbish.module.paths = '?.so;?/?.so;'
|
||||
.. hilbish.userDir.data .. 'hilbish/libs/?/?.so'
|
||||
.. ";" .. hilbish.userDir.data .. 'hilbish/libs/?.so'
|
||||
|
||||
table.insert(package.searchers, function(module)
|
||||
table.insert(package.searchers, function(module)
|
||||
local path = package.searchpath(module, hilbish.module.paths)
|
||||
if not path then return nil end
|
||||
|
||||
-- it didnt work normally, idk
|
||||
return function() return hilbish.module.load(path) end, path
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
require 'nature.commands'
|
||||
require 'nature.completions'
|
||||
@ -90,3 +93,4 @@ end)
|
||||
bait.catch('command.not-executable', function(cmd)
|
||||
print(string.format('hilbish: %s: not executable', cmd))
|
||||
end)
|
||||
]]--
|
||||
|
Loading…
x
Reference in New Issue
Block a user