mirror of https://github.com/Hilbis/Hilbish
fix: say if no perms for executable instead of printing not found
parent
2f816c33cd
commit
06272778f8
|
@ -166,3 +166,7 @@ bait.catch('command.not-found', function(cmd)
|
||||||
print(string.format('hilbish: %s not found', cmd))
|
print(string.format('hilbish: %s not found', cmd))
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
bait.catch('command.no-perm', function(cmd)
|
||||||
|
print(string.format('hilbish: %s: no permission', cmd))
|
||||||
|
end)
|
||||||
|
|
||||||
|
|
39
shell.go
39
shell.go
|
@ -4,12 +4,13 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
// "github.com/bobappleyard/readline"
|
// "github.com/bobappleyard/readline"
|
||||||
"github.com/yuin/gopher-lua"
|
"github.com/yuin/gopher-lua"
|
||||||
// "github.com/yuin/gopher-lua/parse"
|
// "github.com/yuin/gopher-lua/parse"
|
||||||
"mvdan.cc/sh/v3/interp"
|
"mvdan.cc/sh/v3/interp"
|
||||||
"mvdan.cc/sh/v3/syntax"
|
"mvdan.cc/sh/v3/syntax"
|
||||||
)
|
)
|
||||||
|
@ -95,7 +96,6 @@ func execCommand(cmd string) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
exechandle := func(ctx context.Context, args []string) error {
|
exechandle := func(ctx context.Context, args []string) error {
|
||||||
hc := interp.HandlerCtx(ctx)
|
|
||||||
_, argstring := splitInput(strings.Join(args, " "))
|
_, argstring := splitInput(strings.Join(args, " "))
|
||||||
|
|
||||||
// If alias was found, use command alias
|
// If alias was found, use command alias
|
||||||
|
@ -142,11 +142,15 @@ func execCommand(cmd string) error {
|
||||||
return interp.NewExitStatus(exitcode)
|
return interp.NewExitStatus(exitcode)
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := interp.LookPathDir(hc.Dir, hc.Env, args[0]); err != nil {
|
err := lookpath(args[0])
|
||||||
|
if err == os.ErrPermission {
|
||||||
|
hooks.Em.Emit("command.no-perm", args[0])
|
||||||
|
return interp.NewExitStatus(126)
|
||||||
|
} else if err != nil {
|
||||||
hooks.Em.Emit("command.not-found", args[0])
|
hooks.Em.Emit("command.not-found", args[0])
|
||||||
return interp.NewExitStatus(127)
|
return interp.NewExitStatus(127)
|
||||||
}
|
}
|
||||||
|
|
||||||
return interp.DefaultExecHandler(2 * time.Second)(ctx, args)
|
return interp.DefaultExecHandler(2 * time.Second)(ctx, args)
|
||||||
}
|
}
|
||||||
runner, _ := interp.New(
|
runner, _ := interp.New(
|
||||||
|
@ -158,6 +162,31 @@ func execCommand(cmd string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// custom lookpath function so we know if a command is found *and* has execute permission
|
||||||
|
func lookpath(file string) error {
|
||||||
|
for _, dir := range filepath.SplitList(os.Getenv("PATH")) {
|
||||||
|
path := filepath.Join(dir, file)
|
||||||
|
err := findExecutable(path)
|
||||||
|
if err == os.ErrPermission {
|
||||||
|
return err
|
||||||
|
} else if err == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return os.ErrNotExist
|
||||||
|
}
|
||||||
|
func findExecutable(name string) error {
|
||||||
|
f, err := os.Stat(name)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if m := f.Mode(); !m.IsDir() && m & 0111 != 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return os.ErrPermission
|
||||||
|
}
|
||||||
|
|
||||||
func splitInput(input string) ([]string, string) {
|
func splitInput(input string) ([]string, string) {
|
||||||
// end my suffering
|
// end my suffering
|
||||||
// TODO: refactor this garbage
|
// TODO: refactor this garbage
|
||||||
|
|
Loading…
Reference in New Issue