From 3178f0e26a02bd642372d1ae9cfe9145f4491787 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 2 Dec 2020 22:18:08 +0100 Subject: [PATCH] Change terminal package --- go.mod | 4 +++- go.sum | 6 ++++++ pkg/cmd/user.go | 6 +++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 8a7d62a62..5b11632df 100644 --- a/go.mod +++ b/go.mod @@ -60,8 +60,8 @@ require ( github.com/onsi/ginkgo v1.13.0 // indirect github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 github.com/pelletier/go-toml v1.8.0 // indirect - github.com/pquerna/otp v1.3.0 github.com/pquerna/cachecontrol v0.0.0-20200921180117-858c6e7e6b7e // indirect + github.com/pquerna/otp v1.3.0 github.com/prometheus/client_golang v1.8.0 github.com/samedi/caldav-go v3.0.0+incompatible github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 @@ -80,6 +80,8 @@ require ( golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0 // indirect golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 + golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3 // indirect + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 golang.org/x/tools v0.0.0-20201017001424-6003fad69a88 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect diff --git a/go.sum b/go.sum index 540ad51ab..19b05f6c5 100644 --- a/go.sum +++ b/go.sum @@ -1105,8 +1105,14 @@ golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211 h1:9UQO31fZ+0aKQOFldThf7BKPMJTiBfWycGh/u3UoO88= golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3 h1:kzM6+9dur93BcC2kVlYl34cHU+TYZLanmpSJHVMmL64= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pkg/cmd/user.go b/pkg/cmd/user.go index b1f37bd33..88a827711 100644 --- a/pkg/cmd/user.go +++ b/pkg/cmd/user.go @@ -30,7 +30,7 @@ import ( "code.vikunja.io/api/pkg/user" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" - "golang.org/x/crypto/ssh/terminal" + "golang.org/x/term" ) var ( @@ -73,12 +73,12 @@ func getPasswordFromFlagOrInput() (pw string) { pw = userFlagPassword if userFlagPassword == "" { fmt.Print("Enter Password: ") - bytePW, err := terminal.ReadPassword(int(os.Stdin.Fd())) + bytePW, err := term.ReadPassword(int(os.Stdin.Fd())) if err != nil { log.Fatalf("Error reading password: %s", err) } fmt.Printf("\nConfirm Password: ") - byteConfirmPW, err := terminal.ReadPassword(int(os.Stdin.Fd())) + byteConfirmPW, err := term.ReadPassword(int(os.Stdin.Fd())) if err != nil { log.Fatalf("Error reading password: %s", err) }