0dbaa05759
Since 5b3f31bf14 fixes the newline being added to termux-clipboard-get, this workaround is no longer required here and actually breaks the comparission.
38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
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"
|
|
export GPG_TTY="${GPG_TTY:-$(tty 2>/dev/null)}"
|
|
which gpg2 &>/dev/null && GPG="gpg2"
|
|
[[ -n $GPG_AGENT_INFO || $GPG == "gpg2" ]] && GPG_OPTS+=( "--batch" "--use-agent" )
|
|
-
|
|
+TMPDIR=$PREFIX/tmp
|
|
PREFIX="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
|
|
EXTENSIONS="${PASSWORD_STORE_EXTENSIONS_DIR:-$PREFIX/.extensions}"
|
|
X_SELECTION="${PASSWORD_STORE_X_SELECTION:-clipboard}"
|
|
@@ -156,11 +156,11 @@ clip() {
|
|
# 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" 2>/dev/null | $BASE64)"
|
|
- echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard"
|
|
+ local before="$(termux-clipboard-get 2>/dev/null | $BASE64)"
|
|
+ echo -n "$1" | termux-clipboard-set || die "Error: Could not copy data to the clipboard"
|
|
(
|
|
( exec -a "$sleep_argv0" bash <<<"trap 'kill %1' TERM; sleep '$CLIP_TIME' & wait" )
|
|
- local now="$(xclip -o -selection "$X_SELECTION" | $BASE64)"
|
|
+ local now="$(termux-clipboard-get | $BASE64)"
|
|
[[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now"
|
|
|
|
# It might be nice to programatically check to see if klipper exists,
|
|
@@ -172,7 +172,7 @@ clip() {
|
|
# 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"
|
|
+ echo "$before" | $BASE64 -d | termux-clipboard-set
|
|
) >/dev/null 2>&1 & disown
|
|
echo "Copied $2 to clipboard. Will clear in $CLIP_TIME seconds."
|
|
}
|