From 2f9d7edb660a41e282fd9001e433b9530412f08b Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 8 May 2020 00:17:15 +0200 Subject: gopass: Rebase pager colour patch against v1.9.0 The import list of list.go has changed upstream, so the rebase of this patch doesn't change anything in its functionality but just makes sure that it applies against gopass version 1.9.0. Signed-off-by: aszlig --- pkgs/aszlig/gopass/use-color-in-pager.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 86f6fd53..548e317c 100644 --- a/pkgs/aszlig/gopass/use-color-in-pager.patch +++ b/pkgs/aszlig/gopass/use-color-in-pager.patch @@ -1,17 +1,17 @@ diff --git a/pkg/action/list.go b/pkg/action/list.go -index 03de22b..d54113f 100644 +index 8a96407..45b416e 100644 --- a/pkg/action/list.go +++ b/pkg/action/list.go -@@ -14,7 +14,6 @@ import ( - "github.com/justwatchcom/gopass/pkg/termutil" - "github.com/justwatchcom/gopass/pkg/tree" +@@ -9,7 +9,6 @@ import ( + "os/exec" + "strings" - "github.com/fatih/color" - shellquote "github.com/kballard/go-shellquote" - "github.com/pkg/errors" - "github.com/urfave/cli" -@@ -89,7 +88,6 @@ func redirectPager(ctx context.Context, subtree tree.Tree) (io.Writer, *bytes.Bu - if subtree == nil || subtree.Len() < rows { + "github.com/gopasspw/gopass/pkg/ctxutil" + "github.com/gopasspw/gopass/pkg/termutil" + "github.com/gopasspw/gopass/pkg/tree" +@@ -115,7 +114,6 @@ func redirectPager(ctx context.Context, subtree tree.Tree) (io.Writer, *bytes.Bu + if pager := os.Getenv("PAGER"); pager == "" { return stdout, nil } - color.NoColor = true -- cgit 1.4.1