Move pkg/pinentry to github.com/gopasspw/pinentry

RELEASE_NOTES=[CLEANUP] Moving pkg/pinentry to gopasspw/pinentry Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
gopasspw · Mar 24, 2021 · e333409 · e333409
1 parent d00c29a
commit e333409
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 265 deletions.
diff --git a/Makefile b/Makefile
@@ -65,7 +65,6 @@ clean:
 	@rm -f tests/tests
 	@rm -f *.test
 	@rm -rf dist/*
-	@rm -f *.completion
 	@printf '%s\n' '$(OK)'
 
 $(GOPASS_OUTPUT): $(GOFILES_BUILD)

diff --git a/go.mod b/go.mod
@@ -16,6 +16,7 @@ require (
 	github.com/google/go-cmp v0.5.5
 	github.com/google/go-github v17.0.0+incompatible
 	github.com/google/go-github/v33 v33.0.0
+	github.com/gopasspw/pinentry v0.0.2
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/golang-lru v0.5.4

diff --git a/go.sum b/go.sum
@@ -125,6 +125,8 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/gopasspw/pinentry v0.0.2 h1:6OmkoTYMU05PmAJSIZSRjjhiQX15AstdgNa2KimH5XA=
+github.com/gopasspw/pinentry v0.0.2/go.mod h1:lR1WuNI96rXXBCgM601Ima3acnX3ZSPthIAuG6lHa68=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=

diff --git a/internal/backend/crypto/age/askpass.go b/internal/backend/crypto/age/askpass.go
@@ -8,7 +8,7 @@ import (
 	"github.com/gopasspw/gopass/internal/cache"
 	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/debug"
-	"github.com/gopasspw/gopass/pkg/pinentry"
+	"github.com/gopasspw/pinentry"
 	"github.com/gopasspw/gopass/pkg/pinentry/cli"
 )
 

diff --git a/internal/backend/crypto/gpg/cli/binary_others.go b/internal/backend/crypto/gpg/cli/binary_others.go
@@ -6,7 +6,7 @@ import (
 	"os/exec"
 
 	"github.com/gopasspw/gopass/pkg/debug"
-	"github.com/gopasspw/gopass/pkg/pinentry/gpgconf"
+	"github.com/gopasspw/pinentry/gpgconf"
 )
 
 func detectBinary(name string) (string, error) {

diff --git a/pkg/pinentry/gpgconf/gpgconf.go b/pkg/pinentry/gpgconf/gpgconf.go
diff --git a/pkg/pinentry/pinentry.go b/pkg/pinentry/pinentry.go
diff --git a/pkg/pinentry/pinentry_darwin.go b/pkg/pinentry/pinentry_darwin.go
diff --git a/pkg/pinentry/pinentry_others.go b/pkg/pinentry/pinentry_others.go
diff --git a/pkg/pinentry/pinentry_test.go b/pkg/pinentry/pinentry_test.go
diff --git a/pkg/pinentry/pinentry_windows.go b/pkg/pinentry/pinentry_windows.go
diff --git a/zsh.completion b/zsh.completion
@@ -70,7 +70,7 @@ _gopass () {
 	      _gopass_complete_passwords
 	      ;;
 	  create|new)
-	      _arguments : "--store[Which store to use]"
+	      _arguments : "--store[Which store to use]" "--force[Force path selection]"
 	      _describe -t commands "gopass create" subcommands