Compare commits

..

2 Commits

Author SHA1 Message Date
sammy 08c56a54ca
style: formatting 2021-04-20 17:52:01 -04:00
sammy 428db24831
style: put all vars in 1 var() 2021-04-20 17:51:12 -04:00
1 changed files with 18 additions and 17 deletions

35
main.go
View File

@ -2,35 +2,36 @@ package main
import ( import (
"fmt" "fmt"
hooks "hilbish/golibs/bait"
"io" "io"
"os" "os"
"os/signal" "os/signal"
"os/user" "os/user"
"strings" "strings"
hooks "hilbish/golibs/bait"
"github.com/akamensky/argparse" "github.com/akamensky/argparse"
"github.com/bobappleyard/readline" "github.com/bobappleyard/readline"
lua "github.com/yuin/gopher-lua" "github.com/yuin/gopher-lua"
"golang.org/x/term" "golang.org/x/term"
) )
const version = "0.3.2" const version = "0.3.2"
var l *lua.LState var (
l *lua.LState
// User's prompt, this will get set when lua side is initialized // User's prompt, this will get set when lua side is initialized
var prompt string prompt string
var multilinePrompt = "> " multilinePrompt = "> "
// Map of builtin/custom commands defined in the commander lua module commands = map[string]bool{}
var commands = map[string]bool{} aliases = map[string]string{}
// Command aliases bait hooks.Bait
var aliases = map[string]string{} homedir string
var bait hooks.Bait running bool
var homedir string )
var running bool
func main() { func main() {
homedir, _ = os.UserHomeDir() homedir, _ = os.UserHomeDir()
@ -39,15 +40,15 @@ func main() {
parser := argparse.NewParser("hilbish", "A shell for lua and flower lovers") parser := argparse.NewParser("hilbish", "A shell for lua and flower lovers")
verflag := parser.Flag("v", "version", &argparse.Options{ verflag := parser.Flag("v", "version", &argparse.Options{
Required: false, Required: false,
Help: "Prints Hilbish version", Help: "Prints Hilbish version",
}) })
setshflag := parser.Flag("S", "set-shell-env", &argparse.Options{ setshflag := parser.Flag("S", "set-shell-env", &argparse.Options{
Required: false, Required: false,
Help: "Sets $SHELL to Hilbish's executed path", Help: "Sets $SHELL to Hilbish's executed path",
}) })
configflag := parser.String("C", "config", &argparse.Options{ configflag := parser.String("C", "config", &argparse.Options{
Required: false, Required: false,
Help: "Sets the path to Hilbish's config", Help: "Sets the path to Hilbish's config",
Default: defaultconfpath, Default: defaultconfpath,
}) })
@ -163,7 +164,7 @@ func fmtPrompt() string {
} }
for i, v := range args { for i, v := range args {
if i%2 == 0 { if i % 2 == 0 {
args[i] = "%" + v args[i] = "%" + v
} }
} }