moreinterp: update u-root and remove test workarounds

Ref u-root/u-root#3437

Author: andreynering

moreinterp/coreutils/coreutils.go

@@ -44,7 +44,9 @@ var commandBuilders = map[string]func() core.Command{
 	"touch":  func() core.Command { return touch.New() },
 	"xargs":  func() core.Command { return xargs.New() },
 	"base64": func() core.Command { return base64.New() },
-	"gzip":   func() core.Command { return gzip.New() },
+	"gzcat":  func() core.Command { return gzip.New("gzcat") },
+	"gzip":   func() core.Command { return gzip.New("gzip") },
+	"gunzip": func() core.Command { return gzip.New("gunzip") },
 	"mktemp": func() core.Command { return mktemp.New() },
 	"shasum": func() core.Command { return shasum.New() },
 	"tar":    func() core.Command { return tar.New() },

moreinterp/coreutils/coreutils_test.go

@@ -39,21 +39,6 @@ func TestExecHandler(t *testing.T) {
 				t.Fatalf("expected error for command %q, got none", cmd)
 			}
 
-			// FIXME(@andreynering): Return the proper flag error from u-root to
-			// avoid a special tests for chmod and gzip.
-			if coreUtil == "chmod" {
-				if err.Error() != "chmod: chmod [mode] filepath" {
-					t.Errorf("expected %q output, got: %q", cmd, err)
-				}
-				return
-			}
-			if coreUtil == "gzip" {
-				if err.Error() != "gzip: ignoring stdout, use -f to compression" {
-					t.Errorf("expected %q output, got: %q", cmd, err)
-				}
-				return
-			}
-
 			if !strings.Contains(err.Error(), "flag provided but not defined: -badoption") {
 				t.Errorf("expected error for command %q, got: %v", cmd, err)
 			}

moreinterp/go.mod

@@ -3,7 +3,7 @@ module mvdan.cc/sh/moreinterp
 go 1.24.0
 
 require (
-	github.com/u-root/u-root v0.15.1-0.20251014130006-62f7144b33da
+	github.com/u-root/u-root v0.15.1-0.20251208185023-2f8c7e763cf8
 	mvdan.cc/sh/v3 v3.11.0
 )
 
@@ -13,6 +13,6 @@ require (
 	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
 	github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/term v0.32.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/term v0.37.0 // indirect
 )

moreinterp/go.sum

@@ -18,13 +18,13 @@ github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU
 github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
-github.com/u-root/u-root v0.15.1-0.20251014130006-62f7144b33da h1:Vst9Tvq3G6f6pYBvxy7coi2arDsnOZ3Mkj8MkNarSK8=
-github.com/u-root/u-root v0.15.1-0.20251014130006-62f7144b33da/go.mod h1:R49zft13memK20EgFAvmTbXBS0t29UvglnM0BCA1ldQ=
+github.com/u-root/u-root v0.15.1-0.20251208185023-2f8c7e763cf8 h1:cq+DjLAjz3ZPwh0+G571O/jMH0c0DzReDPLjQGL2/BA=
+github.com/u-root/u-root v0.15.1-0.20251208185023-2f8c7e763cf8/go.mod h1:JNauIV2zopCBv/6o+umxcT3bKe8YUqYJaTZQYSYpKss=
 github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 h1:pyC9PaHYZFgEKFdlp3G8RaCKgVpHZnecvArXvPXcFkM=
 github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701/go.mod h1:P3a5rG4X7tI17Nn3aOIAYr5HbIMukwXG0urG0WuL8OA=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-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/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
+golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
 mvdan.cc/sh/v3 v3.11.0 h1:q5h+XMDRfUGUedCqFFsjoFjrhwf2Mvtt1rkMvVz0blw=
 mvdan.cc/sh/v3 v3.11.0/go.mod h1:LRM+1NjoYCzuq/WZ6y44x14YNAI0NK7FLPeQSaFagGg=