diff options
| author | Wieland Hoffmann <themineo@gmail.com> | 2015-01-19 14:07:07 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2015-01-19 14:15:51 +0100 |
| commit | 0524ef9aad5e908c4062c2696a3b7a807bd494c7 (patch) | |
| tree | 00e79bc71bc1e7b4e7de6bfbf17de0cb7b32f802 | |
| parent | 2c02186ea66b1500d758f6f30222079558bcd1c9 (diff) | |
| download | pass-0524ef9aad5e908c4062c2696a3b7a807bd494c7.tar.gz pass-0524ef9aad5e908c4062c2696a3b7a807bd494c7.tar.bz2 pass-0524ef9aad5e908c4062c2696a3b7a807bd494c7.zip | |
clip: Show an error message if xclip returns a non-zero exit code
xclip will return a non-zero exit code if $DISPLAY is not set, which
might happen, for example, if you're running pass in a tmux session
remotely or something like that. xclip itself will also show an error
message ("Can't open display") which provides enough context to figure
out what the problem is.
There might be other reasons for xclip to return a non-zero exit code,
but the man page doesn't list them.
| -rwxr-xr-x | src/password-store.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/password-store.sh b/src/password-store.sh index 160250f..efe0f3d 100755 --- a/src/password-store.sh +++ b/src/password-store.sh @@ -131,11 +131,10 @@ clip() { # This base64 business is because bash cannot store binary data in a shell # variable. Specifically, it cannot store nulls nor (non-trivally) store # trailing new lines. - local sleep_argv0="password store sleep on display $DISPLAY" pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 - local before="$(xclip -o -selection "$X_SELECTION" | base64)" - echo -n "$1" | xclip -selection "$X_SELECTION" + local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | base64)" + echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard" ( ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" ) local now="$(xclip -o -selection "$X_SELECTION" | base64)" |