From 1ff1045445ecfb9b4a7f122d46436fcfcdd1b150 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 1 Mar 2024 21:45:30 -0600 Subject: start fixing all this old junk --- run.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'run.go') diff --git a/run.go b/run.go index 79f1214..7a4f3b6 100644 --- a/run.go +++ b/run.go @@ -47,22 +47,25 @@ func RunString(args string) bool { func Run(args []string) bool { dir, err := os.Getwd() if err != nil { - println("Failed to get current directory:", err) return false } - return RunPath(dir, args) + err = RunPath(dir, args) + if err == nil { + return true + } + return false } +var ErrorArgvEmpty error = errors.New("command was empty") + // run, but set the working path -func RunPath(path string, args []string) bool { +func RunPath(path string, args []string) error { if len(args) == 0 { - log.Warn("command line was empty") - return false + return ErrorArgvEmpty } if args[0] == "" { - log.Warn("command line was empty") - return false + return ErrorArgvEmpty } thing := args[0] parts := args[1:] @@ -81,9 +84,9 @@ func RunPath(path string, args []string) bool { log.Info("path =", path) log.Info("args =", args) log.Info("err =", err.Error()) - return false + return err } - return true + return nil } func (cmd *OldShell) Run(cmdline string) string { -- cgit v1.2.3