about summary refs log tree commit diff
path: root/pkgs/aszlig/gopass/use-color-in-pager.patch
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2018-05-27 06:17:14 +0200
committeraszlig <aszlig@nix.build>2018-05-27 06:17:14 +0200
commit57ebb4111c2d36fe5d95223e3adb0da4faf3d753 (patch)
tree37bb7ec0f608e836d8037e1cf04ff92b96715be2 /pkgs/aszlig/gopass/use-color-in-pager.patch
parent1ffd55e697636d75598b2223cf8c3ed750d047a9 (diff)
pkgs/gopass: Rebase patches against version 1.7.1
The patches are basically the same but only the files were moved to a
different place in the upstream repository.

Tested building and execution.

Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'pkgs/aszlig/gopass/use-color-in-pager.patch')
-rw-r--r--pkgs/aszlig/gopass/use-color-in-pager.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/aszlig/gopass/use-color-in-pager.patch b/pkgs/aszlig/gopass/use-color-in-pager.patch
index 52ea8801..86f6fd53 100644
--- a/pkgs/aszlig/gopass/use-color-in-pager.patch
+++ b/pkgs/aszlig/gopass/use-color-in-pager.patch
@@ -1,16 +1,16 @@
-diff --git a/action/list.go b/action/list.go
-index c5d2ae0..715ce65 100644
---- a/action/list.go
-+++ b/action/list.go
-@@ -9,7 +9,6 @@ import (
- 	"os/exec"
- 	"strings"
+diff --git a/pkg/action/list.go b/pkg/action/list.go
+index 03de22b..d54113f 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"
  
 -	"github.com/fatih/color"
- 	"github.com/justwatchcom/gopass/utils/ctxutil"
- 	"github.com/justwatchcom/gopass/utils/out"
- 	"github.com/justwatchcom/gopass/utils/termutil"
-@@ -84,7 +83,6 @@ func redirectPager(ctx context.Context, subtree tree.Tree) (io.Writer, *bytes.Bu
+ 	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 {
  		return stdout, nil
  	}