summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--man/pass.129
-rwxr-xr-xsrc/password-store.sh4
2 files changed, 24 insertions, 9 deletions
diff --git a/man/pass.1 b/man/pass.1
index d00363b..5a8a32b 100644
--- a/man/pass.1
+++ b/man/pass.1
@@ -19,8 +19,7 @@ pass - stores, retrieves, generates, and synchronizes passwords securely
is a very simple password store that keeps passwords inside
.BR gpg (1)
encrypted files inside a simple directory tree residing at
-.IR $HOME/.password-store ,
-or the environment variable \fBPASSWORD_STORE_DIR\fP if it is set.
+.IR ~/.password-store .
The
.B pass
utility provides a series of commands for manipulating the password store,
@@ -43,8 +42,7 @@ extended description using \fBinit\fP and
The \fBinit\fP command must be run before other commands in order to initialize
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.
+the gpg key set with \fBinit\fP.
There is a corresponding bash completion script for use with tab completing
password names in
@@ -318,11 +316,28 @@ To kexec.com:pass-store
.TP
.B ~/.password-store
-The password storage directory.
+The default password storage directory.
.TP
.B ~/.password-store/.gpg-id
-Contains the gpg key identification used for encryption and decryption. This should
-be set using the \fBinit\fP command.
+Contains the default gpg key identification used for encryption and decryption.
+This should be set using the \fBinit\fP command.
+
+.SH ENVIRONMENT VARIABLES
+
+.TP
+.I PASSWORD_STORE_DIR
+Overrides the default password storage directory.
+.TP
+.I PASSWORD_STORE_KEY
+Overrides the default gpg key identification set by \fBinit\fP.
+.TP
+.I PASSWORD_STORE_GIT
+Overrides the default root of the git repository, which is helpful if
+\fIPASSWORD_STORE_DIR\fP is temporarily set to a sub-directory of the default
+password store.
+.TP
+.I EDITOR
+The location of the text editor used by \fBedit\fP.
.SH SEE ALSO
.BR gpg (1),
diff --git a/src/password-store.sh b/src/password-store.sh
index 21f8fe4..b28e408 100755
--- a/src/password-store.sh
+++ b/src/password-store.sh
@@ -7,11 +7,11 @@ umask 077
PREFIX="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
ID="$PREFIX/.gpg-id"
-GIT_DIR="$PREFIX/.git"
+GIT_DIR="${PASSWORD_STORE_GIT:-$PREFIX}/.git"
GPG_OPTS="--quiet --yes --batch"
export GIT_DIR
-export GIT_WORK_TREE="$PREFIX"
+export GIT_WORK_TREE="${PASSWORD_STORE_GIT:-$PREFIX}"
version() {
cat <<_EOF
td>3-50/+43 2008-07-03Ported gpytage pluginRené 'Necoro' Neumann2-16/+14 2008-07-03Ported Notify pluginRené 'Necoro' Neumann4-37/+51 2008-07-03Remove xsd and -x cmdline optionRené 'Necoro' Neumann2-107/+1 2008-07-03Ported completelyRené 'Necoro' Neumann3-548/+54 2008-07-03Should show dependencies nowRené 'Necoro' Neumann2-82/+128 2008-07-03Use __slots__ for the PkgData class to save memoryRené 'Necoro' Neumann1-2/+3 2008-07-03New plugin system - first hackRené 'Necoro' Neumann2-420/+683 2008-06-30Now the new design is able to do the same as the old oneRené 'Necoro' Neumann3-168/+182 2008-06-30First draft of the new plugin windowRené 'Necoro' Neumann1-8/+172 2008-06-30Added stuff to plugin.pyRené 'Necoro' Neumann1-2/+24 2008-06-30Beautified some dialogsRené 'Necoro' Neumann1-6/+8 2008-06-30Only add a package to mergequeue if everything went fineRené 'Necoro' Neumann1-1/+1 2008-06-25Now load 22 versions when running the correct portageRené 'Necoro' Neumann4-8/+18 2008-06-25Added Package_22 and System_22René 'Necoro' Neumann4-5/+63