summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Chatzimichos <tampakrap@gmail.com>2015-01-27 19:09:01 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2015-01-27 19:12:39 +0100
commit5f3e0b36af40c1fc5991fce76e9998313d36c6ee (patch)
tree97cfed96330c232019fcd8bd4fe48b7fcbd1e862
parent0524ef9aad5e908c4062c2696a3b7a807bd494c7 (diff)
downloadpass-5f3e0b36af40c1fc5991fce76e9998313d36c6ee.tar.gz
pass-5f3e0b36af40c1fc5991fce76e9998313d36c6ee.tar.bz2
pass-5f3e0b36af40c1fc5991fce76e9998313d36c6ee.zip
Strip ".gpg" from symlinks as well
Symlinks inside password-store make sense when using passff in firefox, and have the same LDAP password in different websites. In order to have passff working correctly then, we need to strip the .gpg extension from symlinks as well. Example output of `pass find site1` or `pass | grep site1` before this commit: site1.job.com.gpg -> site2.job.com and after: site1.job.com -> site2.job.com
Diffstat (limited to '')
-rwxr-xr-xsrc/password-store.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/password-store.sh b/src/password-store.sh
index efe0f3d..3ab0867 100755
--- a/src/password-store.sh
+++ b/src/password-store.sh
@@ -322,7 +322,7 @@ cmd_show() {
else
echo "${path%\/}"
fi
- tree -C -l --noreport "$PREFIX/$path" | tail -n +2 | sed 's/\.gpg\(\x1B\[[0-9]\+m\)\{0,1\}$/\1/' # remove .gpg at end of line, but keep colors
+ tree -C -l --noreport "$PREFIX/$path" | tail -n +2 | sed 's/\.gpg\(\x1B\[[0-9]\+m\)\{0,1\}\( ->\|$\)/\1\2/g' # remove .gpg at end of line, but keep colors
elif [[ -z $path ]]; then
die "Error: password store is empty. Try \"pass init\"."
else
@@ -334,7 +334,7 @@ cmd_find() {
[[ -z "$@" ]] && die "Usage: $PROGRAM $COMMAND pass-names..."
IFS="," eval 'echo "Search Terms: $*"'
local terms="*$(printf '%s*|*' "$@")"
- tree -C -l --noreport -P "${terms%|*}" --prune --matchdirs --ignore-case "$PREFIX" | tail -n +2 | sed 's/\.gpg$//'
+ tree -C -l --noreport -P "${terms%|*}" --prune --matchdirs --ignore-case "$PREFIX" | tail -n +2 | sed 's/\.gpg\(\x1B\[[0-9]\+m\)\{0,1\}\( ->\|$\)/\1\2/g'
}
cmd_grep() {