Merge d1934452bb985119369d077c89cb899d6fa2eeb6 into 4743222044d5e1961ce089b0d4a602005519bce3

fix: dont import util in the util package (bruh)
fix: undefined vars on windows
2025-04-21 21:13:22 +00:00 · 2024-12-29 05:52:03 +00:00 · 2024-12-29 01:52:00 -04:00 · 2024-12-29 01:48:11 -04:00 · 2024-12-29 01:44:24 -04:00
2 changed files with 7 additions and 4 deletions
--- a/golibs/snail/lua.go
+++ b/golibs/snail/lua.go
@ -85,6 +85,9 @@ func srun(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 			if code, ok := interp.IsExitStatus(err); ok {
 				exitCode = int(code)
 			} else {
+				if exErr, ok := util.IsExecError(err); ok {
+					exitCode = exErr.Code
+				}
 				luaErr = rt.StringValue(err.Error())
 			}
 		}
--- a/util/util_windows.go
+++ b/util/util_windows.go
@ -21,15 +21,15 @@ func FindExecutable(path string, inPath, dirs bool) error {
 		} else {
 			_, err := os.Stat(path)
 			if err == nil {
-				if contains(pathExts, nameExt) { return nil }
-				return errNotExec
+				if Contains(pathExts, nameExt) { return nil }
+				return ErrNotExec
 			}
 		}
 	} else {
 		_, err := os.Stat(path)
 		if err == nil {
-			if contains(pathExts, nameExt) { return nil }
-			return errNotExec
+			if Contains(pathExts, nameExt) { return nil }
+			return ErrNotExec
 		}
 	}
Author	SHA1	Message	Date
sammy	e3ce1b977b	Merge d1934452bb985119369d077c89cb899d6fa2eeb6 into 4743222044d5e1961ce089b0d4a602005519bce3	2024-12-29 05:52:03 +00:00
sammyette	d1934452bb	fix: dont import util in the util package (bruh)	2024-12-29 01:52:00 -04:00
sammyette	7174f40b5f	fix: undefined vars on windows	2024-12-29 01:48:11 -04:00
sammyette	a8435b649d	fix: use error code if err is ExecError	2024-12-29 01:44:24 -04:00