about summary refs log tree commit diff
path: root/pkgs/aszlig
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2020-05-08 00:17:15 +0200
committeraszlig <aszlig@nix.build>2020-05-08 00:17:15 +0200
commit2f9d7edb660a41e282fd9001e433b9530412f08b (patch)
treea01a17010a972225791d9f6c652572c2fbc6c46a /pkgs/aszlig
parent82eb432fd599abd47aaa14d55dfb6550ebca3eb4 (diff)
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 <aszlig@nix.build>
Diffstat (limited to 'pkgs/aszlig')
-rw-r--r--pkgs/aszlig/gopass/use-color-in-pager.patch18
1 files changed, 9 insertions, 9 deletions
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