diff options
Diffstat (limited to 'pass-parcellite.patch')
| -rw-r--r-- | pass-parcellite.patch | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/pass-parcellite.patch b/pass-parcellite.patch index f2a5d1072cd0..b8c1f689baf9 100644 --- a/pass-parcellite.patch +++ b/pass-parcellite.patch @@ -1,26 +1,13 @@ diff --unified --recursive --text password-store-1.7.3.orig/src/password-store.sh password-store-1.7.3.new/src/password-store.sh --- password-store-1.7.3.orig/src/password-store.sh 2018-08-03 15:32:48.000000000 +1200 -+++ password-store-1.7.3.new/src/password-store.sh 2019-04-20 14:09:13.702924600 +1200 -@@ -155,7 +155,8 @@ - # 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 -+ # Allow multiple $sleep_argv0 processes -+ #pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 - 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" - ( -@@ -173,6 +174,12 @@ ++++ password-store-1.7.3.new/src/password-store.sh 2019-04-20 15:17:19.671661200 +1200 +@@ -172,6 +172,9 @@ + # so we axe it here: qdbus org.kde.klipper /klipper org.kde.klipper.klipper.clearClipboardHistory &>/dev/null - echo "$before" | $BASE64 -d | xclip -selection "$X_SELECTION" ++ # Clear Parcellite clipboard history ++ echo -n "clear_all" > "$HOME"/.local/share/parcellite/fifo_cmd 2>/dev/null + -+ # Wait until all $sleep_argv0 processes have cleared, then -+ # wipe the Parcellite clipboard history -+ while pgrep -f "^$sleep_argv0" 2>/dev/null; do -+ : -+ done; echo -n "clear_all" > "$HOME"/.local/share/parcellite/fifo_cmd + echo "$before" | $BASE64 -d | xclip -selection "$X_SELECTION" ) >/dev/null 2>&1 & disown echo "Copied $2 to clipboard. Will clear in $CLIP_TIME seconds." - } |