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."
ef15bb7c61b636a33fc&follow=1'>Add link to emacs password store.Jason A. Donenfeld1-0/+2 2014-04-22reencryption: take into account groupsJason A. Donenfeld1-10/+26 2014-04-22zsh-completion: only remove next char if /Jason A. Donenfeld1-3/+2 2014-04-22Import Von's tests, with cleanups.Jason A. Donenfeld19-2/+1146 2014-04-22insert: exit with error if EOFJason A. Donenfeld1-2/+2 2014-04-21insert: Go to top of loop if invalid read.Jason A. Donenfeld1-2/+2 2014-04-21makefile: install completion automatically and adjust lib pathsJason A. Donenfeld1-12/+30 2014-04-20Use sort -u instead of uniqJason A. Donenfeld1-2/+2 2014-04-20Don't use subshells for reading from find.Jason A. Donenfeld1-4/+4 2014-04-19bash-completion: fix completion-file's name in uninstallschalox1-1/+1 2014-04-19platform: Auto-detect local platform fileJason A. Donenfeld2-3/+3 2014-04-19platform: Allow custom platform file before installJason A. Donenfeld2-3/+5 2014-04-18reencrypt: cleaner temp file declarationJason A. Donenfeld1-4/+4 2014-04-18Remove unneeded semicolon.Jason A. Donenfeld1-14/+14 2014-04-18Check sneaky paths.Jason A. Donenfeld1-0/+15 2014-04-18Pruning: turns out rmdir does it for us with -p.Jason A. Donenfeld1-9/+3 2014-04-18Abstract remove empty directories into function.Jason A. Donenfeld1-14/+11 2014-04-18Remember to prune empty folders.Jason A. Donenfeld1-0/+8 2014-04-18init: allow deinitializationJason A. Donenfeld2-2/+18 2014-04-18bash-completion: filter dot files from resultsJason A. Donenfeld1-3/+8 2014-04-18reencrypt: remove option, do automaticallyJason A. Donenfeld5-39/+25 2014-04-18reencryption: add to completion filesJason A. Donenfeld3-1/+5 2014-04-18Specify variable gpg.Jason A. Donenfeld1-1/+1 2014-04-18style: don't escape new line on &&Jason A. Donenfeld1-2/+2 2014-04-18reencryption: remove temporary file on failureJason A. Donenfeld1-1/+1 2014-04-18reencryption: only reencrypt files when requiredJason A. Donenfeld2-16/+37 2014-04-17cp: typo as cvJason A. Donenfeld1-1/+1 2014-04-17bash: gpg_id is localJason A. Donenfeld1-0/+1 2014-04-17move/copy: always reencrypt passwords at destinationJason A. Donenfeld5-25/+56 2014-04-17makefile: allow platform files with gnu sedJason A. Donenfeld1-7/+8 2014-04-17mv: Add pass mv/rename supportJason A. Donenfeld5-3/+78 2014-04-17revelation2pass: add plain XML importJavali1-11/+15 2014-04-17platform: add cygwin supportJason A. Donenfeld2-1/+17