---
src/password-store.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/password-store.sh b/src/password-store.sh
index 24b5003..0141599 100755
--- a/src/password-store.sh
+++ b/src/password-store.sh
@@ -375,19 +375,19 @@ cmd_show() {
--) shift; break ;;
esac done
- [[ $err -ne 0 || ( $qrcode -eq 1 && $clip -eq 1 ) ]] && die "Usage:
$PROGRAM $COMMAND [--clip[=line-number],-c[line-number]]
[--qrcode[=line-number],-q[line-number]] [pass-name]"
+ [[ $err -ne 0 || ( $qrcode -eq 1 && $clip -eq 1 && $nextclip -eq 1) ]]
&& die "Usage: $PROGRAM $COMMAND [--clip[=line-number],-c[line-number]]
[--qrcode[=line-number],-q[line-number]] [pass-name]"
local path="$1"
local passfile="$PREFIX/$path.gpg"
check_sneaky_paths "$path"
if [[ -f $passfile ]]; then
- if [[ $clip -eq 0 && $qrcode -eq 0 ]]; then
+ if [[ $clip -eq 0 && $qrcode -eq 0 && $nextclip -eq 0 ]]; then
$GPG -d "${GPG_OPTS[@]}" "$passfile" || exit $?
else
[[ $selected_line =~ ^[0-9]+$ ]] || die "Clip location
'$selected_line' is not a number."
local pass="$($GPG -d "${GPG_OPTS[@]}" "$passfile" |
tail -n +${selected_line} | head -n 1)"
[[ -n $pass ]] || die "There is no password to put on
the clipboard at line ${selected_line}."
- if [[ $clip -eq 1 ]]; then
+ if [[ $clip -eq 1 || $nextclip -eq 1 ]]; then
clip "$nextclip" "$pass" "$path"
elif [[ $qrcode -eq 1 ]]; then
qrcode "$pass" "$path"
@@ -508,7 +508,7 @@ cmd_edit() {
}
cmd_generate() {
- local opts qrcode=0 clip=0 force=0 characters="$CHARACTER_SET"
inplace=0 pass
+ local opts qrcode=0 clip=0 nextclip=0 force=0
characters="$CHARACTER_SET" inplace=0 pass
opts="$($GETOPT -o nqcif -l no-symbols,qrcode,clip,in-place,force -n
"$PROGRAM" -- "$@")"
local err=$?
eval set -- "$opts"
@@ -521,7 +521,7 @@ cmd_generate() {
--) shift; break ;;
esac done
- [[ $err -ne 0 || ( $# -ne 2 && $# -ne 1 ) || ( $force -eq 1 && $inplace
-eq 1 ) || ( $qrcode -eq 1 && $clip -eq 1 ) ]] && die "Usage: $PROGRAM $COMMAND
[--no-symbols,-n] [--clip,-c] [--qrcode,-q] [--in-place,-i | --force,-f]
pass-name [pass-length]"
+ [[ $err -ne 0 || ( $# -ne 2 && $# -ne 1 ) || ( $force -eq 1 && $inplace
-eq 1 ) || ( $qrcode -eq 1 && $clip -eq 1 && $nextclip -eq 1) ]] && die
"Usage: $PROGRAM $COMMAND [--no-symbols,-n] [--clip,-c] [--qrcode,-q]
[--in-place,-i | --force,-f] pass-name [pass-length]"
local path="$1"
local length="${2:-$GENERATED_LENGTH}"
check_sneaky_paths "$path"
--
2.16.1
_______________________________________________
Password-Store mailing list
[email protected]
https://lists.zx2c4.com/mailman/listinfo/password-store
