From de3f8806f63218c1f1a83c64fc10fe2d79e44224 Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Mon, 23 Mar 2020 16:40:47 +0100 Subject: [PATCH] crypto/keys: simplify pass keyring directory (#5852) Store keys into $HOME/.password-store/keyring-appcli instead of $HOME/.password-store/$HOME/.appcli/. The latter is very user unfriendly. --- crypto/keys/keyring.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/keys/keyring.go b/crypto/keys/keyring.go index e664b1d2d1..ff2516afee 100644 --- a/crypto/keys/keyring.go +++ b/crypto/keys/keyring.go @@ -34,6 +34,7 @@ const ( const ( keyringDirNameFmt = "keyring-%s" testKeyringDirNameFmt = "keyring-test-%s" + passKeyringPrefix = keyringDirNameFmt ) var _ Keybase = keyringKeybase{} @@ -490,7 +491,7 @@ func newKWalletBackendKeyringConfig(appName, _ string, _ io.Reader) keyring.Conf } func newPassBackendKeyringConfig(appName, dir string, _ io.Reader) keyring.Config { - prefix := filepath.Join(dir, fmt.Sprintf(keyringDirNameFmt, appName)) + prefix := fmt.Sprintf(passKeyringPrefix, appName) return keyring.Config{ AllowedBackends: []keyring.BackendType{keyring.PassBackend}, ServiceName: appName,