diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2014-05-08 04:55:20 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2014-05-08 04:55:20 +0200 |
| commit | eb1e05f143404312a54f0135a97225b0a17763f8 (patch) | |
| tree | 305498447f3ccbce4f74daedeefa7d34794dad85 /src/password-store.sh | |
| parent | 38543d1bd5f3c46f08a42146f942c2147d77f634 (diff) | |
| download | pass-eb1e05f143404312a54f0135a97225b0a17763f8.tar.gz pass-eb1e05f143404312a54f0135a97225b0a17763f8.tar.bz2 pass-eb1e05f143404312a54f0135a97225b0a17763f8.zip | |
inplace: mutually exclusive with force
Diffstat (limited to '')
| -rwxr-xr-x | src/password-store.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/password-store.sh b/src/password-store.sh index a844062..a4783b4 100755 --- a/src/password-store.sh +++ b/src/password-store.sh @@ -230,7 +230,7 @@ cmd_usage() { overwriting existing password unless forced. $PROGRAM edit pass-name Insert a new password or edit an existing password using ${EDITOR:-vi}. - $PROGRAM generate [--no-symbols,-n] [--clip,-c] [--in-place,-i] [--force,-f] pass-name pass-length + $PROGRAM generate [--no-symbols,-n] [--clip,-c] [--in-place,-i | --force,-f] pass-name pass-length Generate a new password of pass-length with optionally no symbols. Optionally put it on the clipboard and clear board after 45 seconds. Prompt before overwriting existing password unless forced. @@ -443,7 +443,7 @@ cmd_generate() { --) shift; break ;; esac done - [[ $err -ne 0 || $# -ne 2 ]] && die "Usage: $PROGRAM $COMMAND [--no-symbols,-n] [--clip,-c] [--in-place,-i] [--force,-f] pass-name pass-length" + [[ $err -ne 0 || $# -ne 2 || ( $force -eq 1 && $inplace -eq 1 ) ]] && die "Usage: $PROGRAM $COMMAND [--no-symbols,-n] [--clip,-c] [--in-place,-i | --force,-f] pass-name pass-length" local path="$1" local length="$2" check_sneaky_paths "$path" |