termux-packages/packages/pass/src-password-store.sh.patch

38 lines
1.7 KiB
Diff
Raw Normal View History

diff --git a/src/password-store.sh b/src/password-store.sh
index 7264ffc..f924de3 100755
--- a/src/password-store.sh
+++ b/src/password-store.sh
@@ -11,7 +11,7 @@ GPG="gpg"
2017-02-27 16:03:16 +01:00
export GPG_TTY="${GPG_TTY:-$(tty 2>/dev/null)}"
2016-03-22 00:11:52 +01:00
which gpg2 &>/dev/null && GPG="gpg2"
[[ -n $GPG_AGENT_INFO || $GPG == "gpg2" ]] && GPG_OPTS+=( "--batch" "--use-agent" )
2017-02-27 16:03:16 +01:00
-
+TMPDIR=$PREFIX/tmp
2016-03-22 00:11:52 +01:00
PREFIX="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
2017-02-27 16:03:16 +01:00
EXTENSIONS="${PASSWORD_STORE_EXTENSIONS_DIR:-$PREFIX/.extensions}"
2016-03-22 00:11:52 +01:00
X_SELECTION="${PASSWORD_STORE_X_SELECTION:-clipboard}"
@@ -156,11 +156,11 @@ clip() {
2016-03-22 00:11:52 +01:00
# trailing new lines.
local sleep_argv0="password store sleep on display $DISPLAY"
2017-02-27 16:03:16 +01:00
pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
2018-08-06 01:38:35 +02:00
- local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | $BASE64)"
2016-03-22 00:11:52 +01:00
- echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard"
2018-08-06 01:38:35 +02:00
+ local before="$(termux-clipboard-get 2>/dev/null | $BASE64)"
2016-03-22 00:11:52 +01:00
+ echo -n "$1" | termux-clipboard-set || die "Error: Could not copy data to the clipboard"
(
2017-02-27 16:03:16 +01:00
( exec -a "$sleep_argv0" bash <<<"trap 'kill %1' TERM; sleep '$CLIP_TIME' & wait" )
2018-08-06 01:38:35 +02:00
- local now="$(xclip -o -selection "$X_SELECTION" | $BASE64)"
+ local now="$(termux-clipboard-get | $BASE64)"
[[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now"
2016-03-22 00:11:52 +01:00
# It might be nice to programatically check to see if klipper exists,
@@ -172,7 +172,7 @@ clip() {
2016-03-22 00:11:52 +01:00
# so we axe it here:
qdbus org.kde.klipper /klipper org.kde.klipper.klipper.clearClipboardHistory &>/dev/null
2018-08-06 01:38:35 +02:00
- echo "$before" | $BASE64 -d | xclip -selection "$X_SELECTION"
+ echo "$before" | $BASE64 -d | termux-clipboard-set
2018-06-20 01:15:57 +02:00
) >/dev/null 2>&1 & disown
2016-03-22 00:11:52 +01:00
echo "Copied $2 to clipboard. Will clear in $CLIP_TIME seconds."
}