From 4373bf23bde56d45aa76c61986d4584358739b60 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Apr 2022 16:35:39 +0200 Subject: gopass: Rebase color patch against version 1.14.0 The patch no longer applies because some of the imports got changed in the context of the diff. Signed-off-by: aszlig --- pkgs/aszlig/gopass/use-color-in-pager.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/aszlig') diff --git a/pkgs/aszlig/gopass/use-color-in-pager.patch b/pkgs/aszlig/gopass/use-color-in-pager.patch index b4d132d6..ee301d13 100644 --- a/pkgs/aszlig/gopass/use-color-in-pager.patch +++ b/pkgs/aszlig/gopass/use-color-in-pager.patch @@ -1,5 +1,5 @@ diff --git a/internal/action/list.go b/internal/action/list.go -index 05fb5155..7e70ffc2 100644 +index abfe0fda..e4269f67 100644 --- a/internal/action/list.go +++ b/internal/action/list.go @@ -9,7 +9,6 @@ import ( @@ -7,10 +7,10 @@ index 05fb5155..7e70ffc2 100644 "strings" - "github.com/fatih/color" + "github.com/gopasspw/gopass/internal/action/exit" + "github.com/gopasspw/gopass/internal/store/leaf" "github.com/gopasspw/gopass/internal/tree" - "github.com/gopasspw/gopass/pkg/ctxutil" - "golang.org/x/crypto/ssh/terminal" -@@ -111,7 +110,6 @@ func redirectPager(ctx context.Context, subtree *tree.Root) (io.Writer, *bytes.B +@@ -117,7 +116,6 @@ func redirectPager(ctx context.Context, subtree *tree.Root) (io.Writer, *bytes.B if pager := os.Getenv("PAGER"); pager == "" { return stdout, nil } -- cgit 1.4.1