summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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."
omatic loading of the external menuRené 'Necoro' Neumann2-3/+25 2009-09-06Make glade update the MainWindow.ui fileRené 'Necoro' Neumann1-85/+134 2009-09-06Moved the menu to an extra fileRené 'Necoro' Neumann2-210/+207 2009-09-05One database instance is enough :)René 'Necoro' Neumann1-7/+18 2009-09-05Print database type at the bottom of exceptions. NOTE: This does not handle ↵René 'Necoro' Neumann2-1/+6 multiple databases used at the same time 2009-09-05Fix an error, where a category vanishes after refreshing, using the ↵René 'Necoro' Neumann2-1/+19 EixSQLDatabase 2009-09-03And here is the debugging again :) ... using ctypesRené 'Necoro' Neumann1-1/+8 2009-09-03Screw debugging ... prefer the ctypes approach to get rid of yet another ↵René 'Necoro' Neumann3-27/+11 c-module. 2009-09-03Use this wrapper instead of ctypes to set the textdomain and stuff for the ↵René 'Necoro' Neumann1-9/+5 gtk.Builder 2009-09-03Add small wrapper to C-gettextRené 'Necoro' Neumann2-1/+22 2009-08-31Update messages.potRené 'Necoro' Neumann1-42/+94 2009-08-31Removed the gtk- strings from translationsRené 'Necoro' Neumann7-3639/+3479 2009-08-31Removed the 'translatable' attribute from 'gtk-*' stringsRené 'Necoro' Neumann5-11/+11 2009-08-31Removed TODO. Renamed ChangeLog to TODORené 'Necoro' Neumann2-40/+0 2009-08-27Only import stuff if necessaryRené 'Necoro' Neumann1-8/+8 2009-08-25Release the threadQueue-Lock in syncv0.13René 'Necoro' Neumann1-0/+1 2009-08-25Updated portugese translationAlberto Federman Neto1-650/+687 2009-08-15Update spanish translationDaniel Halens1-245/+258 2009-08-15Use boolean flags instead of obscure C flags for ipc.MessageQueueRené 'Necoro' Neumann3-13/+15 2009-08-15TypoRené 'Necoro' Neumann1-1/+1 2009-08-15Enhanced the extensions.shRené 'Necoro' Neumann1-3/+8 2009-08-15Move eix-format to correct locationRené 'Necoro' Neumann1-0/+0