From efdb0ab43ed1a6b354d3cc323a9e42d03296a102 Mon Sep 17 00:00:00 2001 From: Jacob Alzen Date: Mon, 8 Aug 2022 15:33:07 +0200 Subject: [PATCH] Use golang.org/x/term replacement instead of deprecated package --- go.mod | 3 +-- go.sum | 8 -------- progressbar.go | 6 +++--- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 5c407c4..b4bd53f 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,8 @@ require ( github.com/mattn/go-runewidth v0.0.13 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db github.com/stretchr/testify v1.3.0 - golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 ) go 1.13 diff --git a/go.sum b/go.sum index c85b30d..b128740 100644 --- a/go.sum +++ b/go.sum @@ -16,17 +16,9 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 h1:71vQrMauZZhcTVK6KdYM+rklehEEwb3E+ZhaE5jrPrE= -golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 h1:XDXtA5hveEEV8JB2l7nhMTp3t3cHp9ZpwcdjqyEWLlo= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/progressbar.go b/progressbar.go index 487aac2..19e7200 100644 --- a/progressbar.go +++ b/progressbar.go @@ -14,7 +14,7 @@ import ( "github.com/mattn/go-runewidth" "github.com/mitchellh/colorstring" - "golang.org/x/crypto/ssh/terminal" + "golang.org/x/term" ) // ProgressBar is a thread-safe, simple @@ -760,9 +760,9 @@ func renderProgressBar(c config, s *state) (int, error) { } if c.fullWidth && !c.ignoreLength { - width, _, err := terminal.GetSize(int(os.Stdout.Fd())) + width, _, err := term.GetSize(int(os.Stdout.Fd())) if err != nil { - width, _, err = terminal.GetSize(int(os.Stderr.Fd())) + width, _, err = term.GetSize(int(os.Stderr.Fd())) if err != nil { width = 80 }