diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2014-03-22 00:50:20 -0600 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2014-03-22 00:50:20 -0600 |
| commit | 414bab7d973b50431854496811608c549fb541e1 (patch) | |
| tree | 57739d521a60b689c165f26459ea839810756c3c /src | |
| parent | ef16fc0fbede889f1123eace27c6eedf64295497 (diff) | |
| download | pass-414bab7d973b50431854496811608c549fb541e1.tar.gz pass-414bab7d973b50431854496811608c549fb541e1.tar.bz2 pass-414bab7d973b50431854496811608c549fb541e1.zip | |
clip: suppress kill error
Diffstat (limited to 'src')
| -rwxr-xr-x | src/password-store.sh | 2 | ||||
| -rw-r--r-- | src/platform/darwin.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/password-store.sh b/src/password-store.sh index f35a17b..3c9031d 100755 --- a/src/password-store.sh +++ b/src/password-store.sh @@ -117,7 +117,7 @@ clip() { # we're going with this for now. sleep_argv0="password store sleep on display $DISPLAY" - pkill -f "^$sleep_argv0" && sleep 0.1 + pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.1 before="$(xclip -o -selection "$SELECTION" | base64)" echo -n "$1" | xclip -selection "$SELECTION" ( diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh index f964cdd..6b8af4b 100644 --- a/src/platform/darwin.sh +++ b/src/platform/darwin.sh @@ -3,7 +3,7 @@ clip() { sleep_argv0="password store sleep for user $(id -u)" - pkill -f "^$sleep_argv0" && sleep 0.1 + pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.1 before="$(pbpaste | openssl base64)" echo -n "$1" | pbcopy ( @@ -11,7 +11,7 @@ clip() { now="$(pbpaste | openssl base64)" [[ $now != $(echo -n "$1" | openssl base64) ]] && before="$now" echo "$before" | openssl base64 -d | pbcopy - ) & disown + ) 2>dev/null & disown echo "Copied $2 to clipboard. Will clear in 45 seconds." } |