sammyette
/
Hilbish
mirror of https://github.com/Hilbis/Hilbish
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: my stupidity in handling both configs not found

pull/5/head
TorchedSammy 2021-03-21 03:58:04 -04:00
parent 45064af34f
commit 511c734eed
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main.go
View File

@ -19,7 +19,7 @@ import (
"layeh.com/gopher-luar" "layeh.com/gopher-luar"
) )
const version = "0.0.10" const version = "0.0.11"
var l *lua.LState var l *lua.LState
var prompt string var prompt string
var commands = map[string]bool{} var commands = map[string]bool{}
@ -44,11 +44,13 @@ func main() {
os.Setenv("SHELL", os.Args[0]) os.Setenv("SHELL", os.Args[0])
input, _ := os.ReadFile(".hilbishrc.lua") input, err := os.ReadFile(".hilbishrc.lua")
input, err := os.ReadFile("/usr/share/hilbish/.hilbishrc.lua")
if err != nil { if err != nil {
fmt.Println("could not find .hilbishrc.lua or /usr/share/.hilbishrc.lua") input, err = os.ReadFile("/usr/share/hilbish/.hilbishrc.lua")
return if err != nil {
fmt.Println("could not find .hilbishrc.lua or /usr/share/hilbish/.hilbishrc.lua")
return
}
} }
homedir, _ := os.UserHomeDir() homedir, _ := os.UserHomeDir()
@ -109,6 +111,7 @@ func main() {
if len(cmdArgs) == 0 { continue } if len(cmdArgs) == 0 { continue }
if commands[cmdArgs[0]] { if commands[cmdArgs[0]] {
fmt.Printf("%+q", cmdArgs[1:])
err := l.CallByParam(lua.P{ err := l.CallByParam(lua.P{
Fn: l.GetField( Fn: l.GetField(
l.GetTable( l.GetTable(