From 9dd023321c753252b8f4981d4c7a05e508fc3150 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 28 Jul 2025 10:14:43 -0300 Subject: [PATCH 1/2] chore(deps): update mvdan/sh with kill issue fix This includes a fix for a kill issue with grand child processes. That affects, for example, Go programs ran via `go run ...`. * https://github.com/mvdan/sh/issues/1171 * https://github.com/mvdan/sh/pull/1172 --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 32d9dc28d09cc133801c00d0628d6630922eacf5..7abaaa61770cc727f8855ed902ba48e82bb82627 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/u-root/u-root v0.14.1-0.20250724181933-b01901710169 github.com/zeebo/xxh3 v1.0.2 gopkg.in/natefinch/lumberjack.v2 v2.2.1 - mvdan.cc/sh/v3 v3.11.0 + mvdan.cc/sh/v3 v3.12.1-0.20250726150758-e256f53bade8 ) require golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect @@ -131,7 +131,7 @@ require ( golang.org/x/net v0.39.0 // indirect golang.org/x/sync v0.16.0 // indirect golang.org/x/sys v0.34.0 - golang.org/x/term v0.31.0 // indirect + golang.org/x/term v0.32.0 // indirect golang.org/x/text v0.24.0 google.golang.org/genai v1.3.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect diff --git a/go.sum b/go.sum index 07a4be065e84a47701ed330bde1d881500719597..dc76c58a92e9e1c8de26041646e6ad265464eb17 100644 --- a/go.sum +++ b/go.sum @@ -345,8 +345,8 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o= -golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw= +golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= +golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -391,5 +391,5 @@ modernc.org/memory v1.9.1 h1:V/Z1solwAVmMW1yttq3nDdZPJqV1rM05Ccq6KMSZ34g= modernc.org/memory v1.9.1/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= modernc.org/sqlite v1.36.2 h1:vjcSazuoFve9Wm0IVNHgmJECoOXLZM1KfMXbcX2axHA= modernc.org/sqlite v1.36.2/go.mod h1:ADySlx7K4FdY5MaJcEv86hTJ0PjedAloTUuif0YS3ws= -mvdan.cc/sh/v3 v3.11.0 h1:q5h+XMDRfUGUedCqFFsjoFjrhwf2Mvtt1rkMvVz0blw= -mvdan.cc/sh/v3 v3.11.0/go.mod h1:LRM+1NjoYCzuq/WZ6y44x14YNAI0NK7FLPeQSaFagGg= +mvdan.cc/sh/v3 v3.12.1-0.20250726150758-e256f53bade8 h1:yOKqXg3uKDx7VxqnrKRUzB+InP3whTBi7jeggyFkfX0= +mvdan.cc/sh/v3 v3.12.1-0.20250726150758-e256f53bade8/go.mod h1:Se6Cj17eYSn+sNooLZiEUnNNmNxg0imoYlTu4CyaGyg= From 60e7d043fc35831cccccb3941a7cc201abf98125 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 28 Jul 2025 10:22:12 -0300 Subject: [PATCH 2/2] chore: fix lint issue --- internal/shell/shell.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/shell/shell.go b/internal/shell/shell.go index d76f9bdcb355cc9314e570761147ab0bce1fd219..751aeeccd9c7dba977366f859f8f0d910c96dbab 100644 --- a/internal/shell/shell.go +++ b/internal/shell/shell.go @@ -248,9 +248,9 @@ func ExitCode(err error) int { if err == nil { return 0 } - status, ok := interp.IsExitStatus(err) - if ok { - return int(status) + var exitErr interp.ExitStatus + if errors.As(err, &exitErr) { + return int(exitErr) } return 1 }