Unexport more internal packages (#1377)

RELEASE_NOTES=n/a

Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>

app.go

@@ -6,10 +6,10 @@ import (
 	"strings"
 
 	ap "github.com/gopasspw/gopass/internal/action"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store/sub"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/config"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store/sub"
-	"github.com/gopasspw/gopass/pkg/termio"
 
 	"github.com/blang/semver"
 	"github.com/urfave/cli/v2"

commands_test.go

@@ -11,10 +11,10 @@ import (
 	"github.com/blang/semver"
 	"github.com/fatih/color"
 	"github.com/gopasspw/gopass/internal/action"
-	"github.com/gopasspw/gopass/pkg/backend"
+	"github.com/gopasspw/gopass/internal/backend"
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/config"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 	"github.com/stretchr/testify/assert"
 	"github.com/urfave/cli/v2"

context.go

@@ -7,10 +7,10 @@ import (
 
 	"golang.org/x/crypto/ssh/terminal"
 
-	"github.com/gopasspw/gopass/pkg/backend/crypto/gpg"
+	"github.com/gopasspw/gopass/internal/backend/crypto/gpg"
+	"github.com/gopasspw/gopass/internal/store/sub"
 	"github.com/gopasspw/gopass/pkg/config"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/store/sub"
 
 	"github.com/fatih/color"
 )

context_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/gopasspw/gopass/pkg/backend/crypto/gpg"
+	"github.com/gopasspw/gopass/internal/backend/crypto/gpg"
 	"github.com/gopasspw/gopass/pkg/config"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/stretchr/testify/assert"

docs/backends.md

@@ -84,5 +84,5 @@ using existing building blocks - we're a little wary to recommend it for broader
 Also it requires its own Keyring/Agent infrastructure, as the keyformat is quite
 different from what GPG is using.
 
-Please see the backend [Readme](https://github.com/gopasspw/gopass/blob/master/pkg/backend/crypto/xc/README.md) for more details. Proper documentation for this
+Please see the backend [Readme](https://github.com/gopasspw/gopass/blob/master/internal/backend/crypto/xc/README.md) for more details. Proper documentation for this
 backend still needs to written and will be added at a later point.

internal/action/action.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store/root"
 	"github.com/gopasspw/gopass/pkg/config"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store/root"
 
 	"github.com/blang/semver"
 )

internal/action/action_test.go

@@ -9,7 +9,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/gopasspw/gopass/pkg/backend"
+	"github.com/gopasspw/gopass/internal/backend"
 	"github.com/gopasspw/gopass/pkg/config"
 	"github.com/gopasspw/gopass/tests/gptest"
 

internal/action/audit.go

@@ -1,9 +1,9 @@
 package action
 
 import (
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/audit"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 
 	"github.com/urfave/cli/v2"
 )

internal/action/audit_test.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store/secret"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store/secret"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/muesli/goprogressbar"

internal/action/binary/binary.go

@@ -3,7 +3,7 @@ package binary
 import (
 	"context"
 
-	"github.com/gopasspw/gopass/pkg/store"
+	"github.com/gopasspw/gopass/internal/store"
 )
 
 const (

internal/action/binary/binary_test.go

@@ -9,8 +9,8 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/mockstore"
 
 	"github.com/stretchr/testify/assert"

internal/action/binary/cat.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/gopasspw/gopass/internal/action"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store/secret"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store/secret"
 
 	"github.com/urfave/cli/v2"
 )

internal/action/binary/copy.go

@@ -9,9 +9,9 @@ import (
 	"strings"
 
 	"github.com/gopasspw/gopass/internal/action"
+	"github.com/gopasspw/gopass/internal/store/secret"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/fsutil"
-	"github.com/gopasspw/gopass/pkg/store/secret"
 
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"

internal/action/binary/sum.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"github.com/gopasspw/gopass/internal/action"
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 
 	"github.com/urfave/cli/v2"
 )

internal/action/clihelper.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/gopasspw/gopass/pkg/cui"
+	"github.com/gopasspw/gopass/internal/cui"
 	"github.com/urfave/cli/v2"
 )
 

internal/action/clone.go

@@ -5,14 +5,14 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/gopasspw/gopass/pkg/backend"
-	"github.com/gopasspw/gopass/pkg/backend/crypto/xc"
+	"github.com/gopasspw/gopass/internal/backend"
+	"github.com/gopasspw/gopass/internal/backend/crypto/xc"
+	"github.com/gopasspw/gopass/internal/cui"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/config"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/cui"
 	"github.com/gopasspw/gopass/pkg/fsutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/termio"
 
 	"github.com/fatih/color"
 	"github.com/urfave/cli/v2"

internal/action/clone_test.go

@@ -8,11 +8,11 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gopasspw/gopass/pkg/backend"
-	git "github.com/gopasspw/gopass/pkg/backend/rcs/git/cli"
+	"github.com/gopasspw/gopass/internal/backend"
+	git "github.com/gopasspw/gopass/internal/backend/rcs/git/cli"
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/config"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/blang/semver"

internal/action/completion.go

@@ -8,8 +8,8 @@ import (
 
 	fishcomp "github.com/gopasspw/gopass/internal/completion/fish"
 	zshcomp "github.com/gopasspw/gopass/internal/completion/zsh"
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/urfave/cli/v2"
 )
 

internal/action/completion_test.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/gopasspw/gopass/pkg/out"
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/stretchr/testify/assert"

internal/action/config.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"sort"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"

internal/action/config_test.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gopasspw/gopass/pkg/backend"
+	"github.com/gopasspw/gopass/internal/backend"
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/config"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/stretchr/testify/assert"

internal/action/copy.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/termio"
 
 	"github.com/urfave/cli/v2"
 )

internal/action/copy_test.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/fatih/color"

internal/action/create/create.go

@@ -11,15 +11,15 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/gopasspw/gopass/internal/action"
+	"github.com/gopasspw/gopass/internal/cui"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store"
+	"github.com/gopasspw/gopass/internal/store/secret"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/clipboard"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/cui"
 	"github.com/gopasspw/gopass/pkg/fsutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/pkg/pwgen"
-	"github.com/gopasspw/gopass/pkg/store"
-	"github.com/gopasspw/gopass/pkg/store/secret"
-	"github.com/gopasspw/gopass/pkg/termio"
 	"github.com/martinhoefling/goxkcdpwgen/xkcdpwgen"
 	"github.com/urfave/cli/v2"
 )

internal/action/create/create_test.go

@@ -11,9 +11,9 @@ import (
 	"testing"
 
 	aclip "github.com/atotto/clipboard"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/termio"
 	"github.com/gopasspw/gopass/tests/mockstore"
 	"github.com/stretchr/testify/assert"
 	"github.com/urfave/cli/v2"

internal/action/delete.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/termio"
 
 	"github.com/urfave/cli/v2"
 )

internal/action/delete_test.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store/secret"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store/secret"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/stretchr/testify/assert"

internal/action/edit.go

@@ -5,12 +5,12 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/gopasspw/gopass/internal/editor"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store/secret"
 	"github.com/gopasspw/gopass/pkg/audit"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/editor"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/pkg/pwgen"
-	"github.com/gopasspw/gopass/pkg/store/secret"
 
 	"github.com/urfave/cli/v2"
 )

internal/action/edit_test.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/stretchr/testify/assert"

internal/action/env_test.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

internal/action/errors.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/gopasspw/gopass/pkg/out"
+	"github.com/gopasspw/gopass/internal/out"
 
 	"github.com/urfave/cli/v2"
 )

internal/action/errors_test.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 
 	"github.com/stretchr/testify/assert"
 )

internal/action/find.go

@@ -6,9 +6,9 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/gopasspw/gopass/internal/cui"
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/cui"
-	"github.com/gopasspw/gopass/pkg/out"
 
 	"github.com/schollz/closestmatch"
 	"github.com/urfave/cli/v2"

internal/action/find_test.go

@@ -10,9 +10,9 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store/secret"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store/secret"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/fatih/color"

internal/action/fsck.go

@@ -6,11 +6,11 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store/sub"
 	"github.com/gopasspw/gopass/pkg/config"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/fsutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store/sub"
 	"github.com/muesli/goprogressbar"
 	"github.com/urfave/cli/v2"
 )

internal/action/fsck_test.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 	"github.com/muesli/goprogressbar"
 

internal/action/generate.go

@@ -9,14 +9,14 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store"
+	"github.com/gopasspw/gopass/internal/store/secret"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/clipboard"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/pkg/pwgen"
 	"github.com/gopasspw/gopass/pkg/pwgen/xkcdgen"
-	"github.com/gopasspw/gopass/pkg/store"
-	"github.com/gopasspw/gopass/pkg/store/secret"
-	"github.com/gopasspw/gopass/pkg/termio"
 
 	"github.com/fatih/color"
 	"github.com/urfave/cli/v2"

internal/action/generate_test.go

@@ -10,8 +10,8 @@ import (
 	"testing"
 
 	"github.com/fatih/color"
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 	"github.com/urfave/cli/v2"
 

internal/action/git-credential.go

@@ -9,12 +9,12 @@ import (
 	"os/exec"
 	"strings"
 
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store/secret"
+	"github.com/gopasspw/gopass/internal/store/sub"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/fsutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store/secret"
-	"github.com/gopasspw/gopass/pkg/store/sub"
-	"github.com/gopasspw/gopass/pkg/termio"
 	"github.com/urfave/cli/v2"
 )
 

internal/action/git-credential_test.go

@@ -10,9 +10,9 @@ import (
 	"testing"
 
 	"github.com/fatih/color"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/termio"
 	"github.com/gopasspw/gopass/tests/gptest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

internal/action/git.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"os"
 
-	"github.com/gopasspw/gopass/pkg/backend"
+	"github.com/gopasspw/gopass/internal/backend"
+	"github.com/gopasspw/gopass/internal/cui"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/cui"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/termio"
 
 	"github.com/fatih/color"
 	"github.com/pkg/errors"

internal/action/git_test.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/stretchr/testify/assert"

internal/action/grep.go

@@ -3,8 +3,8 @@ package action
 import (
 	"strings"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 
 	"github.com/fatih/color"
 	"github.com/urfave/cli/v2"

internal/action/grep_test.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store/secret"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store/secret"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/stretchr/testify/assert"

internal/action/hibp.go

@@ -7,12 +7,12 @@ import (
 	"io/ioutil"
 	"sort"
 
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	hibpapi "github.com/gopasspw/gopass/pkg/hibp/api"
 	hibpdump "github.com/gopasspw/gopass/pkg/hibp/dump"
 	"github.com/gopasspw/gopass/pkg/notify"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/termio"
 
 	"github.com/fatih/color"
 	"github.com/muesli/goprogressbar"

internal/action/hibp_test.go

@@ -14,9 +14,9 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	hibpapi "github.com/gopasspw/gopass/pkg/hibp/api"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/stretchr/testify/assert"

internal/action/history.go

@@ -3,8 +3,8 @@ package action
 import (
 	"time"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 
 	"github.com/urfave/cli/v2"
 )

internal/action/history_test.go

@@ -7,10 +7,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/gopasspw/gopass/pkg/backend"
+	"github.com/gopasspw/gopass/internal/backend"
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/config"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/blang/semver"

internal/action/init.go

@@ -6,15 +6,15 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/gopasspw/gopass/pkg/backend"
-	"github.com/gopasspw/gopass/pkg/backend/crypto/gpg"
+	"github.com/gopasspw/gopass/internal/backend"
+	"github.com/gopasspw/gopass/internal/backend/crypto/gpg"
+	"github.com/gopasspw/gopass/internal/cui"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store/sub"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/config"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/cui"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/pkg/pwgen/xkcdgen"
-	"github.com/gopasspw/gopass/pkg/store/sub"
-	"github.com/gopasspw/gopass/pkg/termio"
 	"github.com/urfave/cli/v2"
 
 	"github.com/fatih/color"

internal/action/init_test.go

@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gopasspw/gopass/pkg/backend"
+	"github.com/gopasspw/gopass/internal/backend"
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/stretchr/testify/assert"

internal/action/insert.go

@@ -6,14 +6,14 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/gopasspw/gopass/internal/editor"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store"
+	"github.com/gopasspw/gopass/internal/store/secret"
+	"github.com/gopasspw/gopass/internal/store/sub"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/audit"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/editor"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store"
-	"github.com/gopasspw/gopass/pkg/store/secret"
-	"github.com/gopasspw/gopass/pkg/store/sub"
-	"github.com/gopasspw/gopass/pkg/termio"
 
 	"github.com/urfave/cli/v2"
 )

internal/action/insert_test.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/fatih/color"

internal/action/jsonapi.go

@@ -6,10 +6,10 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/gopasspw/gopass/internal/jsonapi"
+	"github.com/gopasspw/gopass/internal/jsonapi/manifest"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/jsonapi"
-	"github.com/gopasspw/gopass/pkg/jsonapi/manifest"
-	"github.com/gopasspw/gopass/pkg/termio"
 
 	"github.com/fatih/color"
 	"github.com/pkg/errors"

internal/action/jsonapi_others.go

@@ -7,11 +7,11 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/gopasspw/gopass/internal/jsonapi/manifest"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/config"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/jsonapi/manifest"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/termio"
 
 	"github.com/fatih/color"
 	"github.com/urfave/cli/v2"

internal/action/jsonapi_test.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/stretchr/testify/assert"

internal/action/jsonapi_windows.go

@@ -8,10 +8,10 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/gopasspw/gopass/internal/jsonapi/manifest"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/jsonapi/manifest"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/termio"
 
 	"github.com/fatih/color"
 	"github.com/urfave/cli/v2"

internal/action/list.go

@@ -10,9 +10,9 @@ import (
 	"strings"
 
 	"github.com/fatih/color"
+	"github.com/gopasspw/gopass/internal/tree"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/termutil"
-	"github.com/gopasspw/gopass/pkg/tree"
+	"golang.org/x/crypto/ssh/terminal"
 
 	shellquote "github.com/kballard/go-shellquote"
 	"github.com/pkg/errors"
@@ -105,8 +105,8 @@ func redirectPager(ctx context.Context, subtree tree.Tree) (io.Writer, *bytes.Bu
 	if ctxutil.IsNoPager(ctx) {
 		return stdout, nil
 	}
-	rows, _ := termutil.GetTermsize()
-	if rows <= 0 {
+	_, rows, err := terminal.GetSize(0)
+	if err != nil {
 		return stdout, nil
 	}
 	if subtree == nil || subtree.Len() < rows {

internal/action/list_test.go

@@ -7,10 +7,10 @@ import (
 	"testing"
 
 	"github.com/fatih/color"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store/secret"
+	"github.com/gopasspw/gopass/internal/tree"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store/secret"
-	"github.com/gopasspw/gopass/pkg/tree"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/stretchr/testify/assert"

internal/action/mount.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"sort"
 
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store"
+	"github.com/gopasspw/gopass/internal/store/root"
+	"github.com/gopasspw/gopass/internal/tree/simple"
 	"github.com/gopasspw/gopass/pkg/config"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store"
-	"github.com/gopasspw/gopass/pkg/store/root"
-	"github.com/gopasspw/gopass/pkg/tree/simple"
 	"github.com/pkg/errors"
 
 	"github.com/fatih/color"

internal/action/mount_test.go

@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/stretchr/testify/assert"

internal/action/move.go

@@ -3,8 +3,8 @@ package action
 import (
 	"fmt"
 
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/termio"
 
 	"github.com/urfave/cli/v2"
 )

internal/action/move_test.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/stretchr/testify/assert"

internal/action/otp.go

@@ -7,11 +7,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store"
 	"github.com/gopasspw/gopass/pkg/clipboard"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/otp"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store"
 
 	"github.com/urfave/cli/v2"
 )

internal/action/otp_test.go

@@ -7,9 +7,9 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store/secret"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store/secret"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/gokyle/twofactor"

internal/action/pwgen/pwgen.go

@@ -8,8 +8,8 @@ import (
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/pwgen"
 	"github.com/gopasspw/gopass/pkg/pwgen/xkcdgen"
-	"github.com/gopasspw/gopass/pkg/termutil"
 	"github.com/urfave/cli/v2"
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 // Pwgen handles the pwgen subcommand
@@ -77,8 +77,8 @@ func pwGen(c *cli.Context, pwLen, pwNum int) error {
 }
 
 func numPerLine(pwLen int) int {
-	_, cols := termutil.GetTermsize()
-	if cols < 1 {
+	cols, _, err := terminal.GetSize(0)
+	if err != nil {
 		return 1
 	}
 

internal/action/recipients.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"sort"
 
+	"github.com/gopasspw/gopass/internal/cui"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store"
+	"github.com/gopasspw/gopass/internal/store/sub"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/cui"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store"
-	"github.com/gopasspw/gopass/pkg/store/sub"
-	"github.com/gopasspw/gopass/pkg/termio"
 
 	"github.com/urfave/cli/v2"
 )

internal/action/recipients_test.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/fatih/color"

internal/action/show.go

@@ -6,12 +6,12 @@ import (
 	"os"
 	"strings"
 
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store"
 	"github.com/gopasspw/gopass/pkg/clipboard"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/notify"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/pkg/qrcon"
-	"github.com/gopasspw/gopass/pkg/store"
 
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"

internal/action/show_test.go

@@ -8,9 +8,9 @@ import (
 	"testing"
 
 	"github.com/atotto/clipboard"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store/secret"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store/secret"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/fatih/color"

internal/action/sync.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/gopasspw/gopass/pkg/backend/rcs/noop"
+	"github.com/gopasspw/gopass/internal/backend/rcs/noop"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/store"
+	subs "github.com/gopasspw/gopass/internal/store/sub"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/notify"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/store"
-	subs "github.com/gopasspw/gopass/pkg/store/sub"
 
 	"github.com/fatih/color"
 	"github.com/pkg/errors"

internal/action/sync_test.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
 	"github.com/stretchr/testify/assert"

internal/action/templates.go

@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/gopasspw/gopass/internal/editor"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/tpl"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/editor"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/tpl"
 
 	"github.com/urfave/cli/v2"
 )

internal/action/templates_test.go

@@ -6,13 +6,13 @@ import (
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
-	_ "github.com/gopasspw/gopass/pkg/backend/crypto"
-	_ "github.com/gopasspw/gopass/pkg/backend/rcs"
-	_ "github.com/gopasspw/gopass/pkg/backend/storage"
+	_ "github.com/gopasspw/gopass/internal/backend/crypto"
+	_ "github.com/gopasspw/gopass/internal/backend/rcs"
+	_ "github.com/gopasspw/gopass/internal/backend/storage"
 
 	"github.com/fatih/color"
 	"github.com/stretchr/testify/assert"

internal/action/unclip_test.go

@@ -7,15 +7,15 @@ import (
 	"os"
 	"testing"
 
-	"github.com/gopasspw/gopass/pkg/out"
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"
 
-	_ "github.com/gopasspw/gopass/pkg/backend/crypto"
-	_ "github.com/gopasspw/gopass/pkg/backend/rcs"
-	_ "github.com/gopasspw/gopass/pkg/backend/storage"
+	_ "github.com/gopasspw/gopass/internal/backend/crypto"
+	_ "github.com/gopasspw/gopass/internal/backend/rcs"
+	_ "github.com/gopasspw/gopass/internal/backend/storage"
 )
 
 func TestUnclip(t *testing.T) {

internal/action/update.go

@@ -1,9 +1,9 @@
 package action
 
 import (
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/internal/updater"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 
 	"github.com/urfave/cli/v2"
 )

internal/action/update_test.go

@@ -13,14 +13,14 @@ import (
 	"runtime"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/internal/updater"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
-	_ "github.com/gopasspw/gopass/pkg/backend/crypto"
-	_ "github.com/gopasspw/gopass/pkg/backend/rcs"
-	_ "github.com/gopasspw/gopass/pkg/backend/storage"
+	_ "github.com/gopasspw/gopass/internal/backend/crypto"
+	_ "github.com/gopasspw/gopass/internal/backend/rcs"
+	_ "github.com/gopasspw/gopass/internal/backend/storage"
 
 	"github.com/dominikschulz/github-releases/ghrel"
 	"github.com/stretchr/testify/assert"

internal/action/version.go

@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"github.com/blang/semver"
+	"github.com/gopasspw/gopass/internal/backend"
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/internal/updater"
-	"github.com/gopasspw/gopass/pkg/backend"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/pkg/protect"
 
 	"github.com/fatih/color"

internal/action/version_test.go

@@ -6,13 +6,13 @@ import (
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/gopasspw/gopass/tests/gptest"
 
-	_ "github.com/gopasspw/gopass/pkg/backend/crypto"
-	_ "github.com/gopasspw/gopass/pkg/backend/rcs"
-	_ "github.com/gopasspw/gopass/pkg/backend/storage"
+	_ "github.com/gopasspw/gopass/internal/backend/crypto"
+	_ "github.com/gopasspw/gopass/internal/backend/rcs"
+	_ "github.com/gopasspw/gopass/internal/backend/storage"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

internal/action/xc/xc.go

@@ -8,12 +8,12 @@ import (
 	"strings"
 
 	"github.com/gopasspw/gopass/internal/action"
-	"github.com/gopasspw/gopass/pkg/backend/crypto/xc"
+	"github.com/gopasspw/gopass/internal/backend/crypto/xc"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/config"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/fsutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/termio"
 	"github.com/urfave/cli/v2"
 )
 

internal/action/xc/xc_test.go

@@ -12,9 +12,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gopasspw/gopass/pkg/backend/crypto/xc"
+	"github.com/gopasspw/gopass/internal/backend/crypto/xc"
+	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
-	"github.com/gopasspw/gopass/pkg/out"
 	"github.com/stretchr/testify/assert"
 	"github.com/urfave/cli/v2"
 )

internal/backend/crypto/age.go

@@ -0,0 +1,3 @@
+package crypto
+
+import _ "github.com/gopasspw/gopass/internal/backend/crypto/age" // registers age backend

internal/backend/crypto/age/age.go

@@ -12,10 +12,10 @@ import (
 
 	"github.com/blang/semver"
 	"github.com/google/go-github/github"
-	"github.com/gopasspw/gopass/pkg/cache"
+	"github.com/gopasspw/gopass/internal/cache"
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/internal/termio"
 	"github.com/gopasspw/gopass/pkg/fsutil"
-	"github.com/gopasspw/gopass/pkg/out"
-	"github.com/gopasspw/gopass/pkg/termio"
 )
 
 const (

internal/backend/crypto/age/loader.go

@@ -3,8 +3,8 @@ package age
 import (
 	"context"
 
-	"github.com/gopasspw/gopass/pkg/backend"
-	"github.com/gopasspw/gopass/pkg/out"
+	"github.com/gopasspw/gopass/internal/backend"
+	"github.com/gopasspw/gopass/internal/out"
 )
 
 const (

internal/backend/crypto/gpg/cli/export.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"os/exec"
 
-	"github.com/gopasspw/gopass/pkg/out"
+	"github.com/gopasspw/gopass/internal/out"
 
 	"github.com/pkg/errors"
 )

internal/backend/crypto/gpg/cli/generate.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/gopasspw/gopass/pkg/out"
+	"github.com/gopasspw/gopass/internal/out"
 
 	"github.com/pkg/errors"
 )

internal/backend/crypto/gpg/cli/gpg.go

@@ -8,8 +8,8 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/gopasspw/gopass/pkg/backend/crypto/gpg"
-	"github.com/gopasspw/gopass/pkg/out"
+	"github.com/gopasspw/gopass/internal/backend/crypto/gpg"
+	"github.com/gopasspw/gopass/internal/out"
 	lru "github.com/hashicorp/golang-lru"
 )