summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2012-09-21 17:23:08 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2012-09-21 17:23:08 +0200
commit9dcae25e1aa627347fccab133617412628f07d7c (patch)
tree3478c9424160ce00ee2c303431d9667417307099
parent9beb5f8b0674bb1502b92bb15d55aecf2e37b45d (diff)
downloadpass-9dcae25e1aa627347fccab133617412628f07d7c.tar.gz
pass-9dcae25e1aa627347fccab133617412628f07d7c.tar.bz2
pass-9dcae25e1aa627347fccab133617412628f07d7c.zip
Add support for PASSWORD_STORE_KEY env var.
Diffstat (limited to '')
-rw-r--r--man/pass.14
-rwxr-xr-xsrc/password-store.sh4
2 files changed, 6 insertions, 2 deletions
diff --git a/man/pass.1 b/man/pass.1
index 67dcca6..d00363b 100644
--- a/man/pass.1
+++ b/man/pass.1
@@ -42,7 +42,9 @@ extended description using \fBinit\fP and
.BR git (1).
The \fBinit\fP command must be run before other commands in order to initialize
-the password store with the correct gpg key id.
+the password store with the correct gpg key id. Passwords are encrypting using
+the gpg key set with \fBinit\fP, unless the \fBPASSWORD_STORE_KEY\fP environment
+variable is set to an alternative key id.
There is a corresponding bash completion script for use with tab completing
password names in
diff --git a/src/password-store.sh b/src/password-store.sh
index f137f55..21f8fe4 100755
--- a/src/password-store.sh
+++ b/src/password-store.sh
@@ -175,7 +175,9 @@ case "$command" in
;;
esac
-if ! [[ -f $ID ]]; then
+if [[ -n $PASSWORD_STORE_KEY ]]; then
+ ID="$PASSWORD_STORE_KEY"
+elif ! [[ -f $ID ]]; then
echo "You must run:"
echo " $program init your-gpg-id"
echo "before you may use the password store."