diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2022-06-27 08:59:32 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2022-06-27 08:59:32 -0300 |
| commit | 65301e5129d9776a39de4e83d3f76be4c4d8749b (patch) | |
| tree | 0fb08475adbcbe14b2c9e049dbbc9a38cea5ea74 /lib | |
| parent | b805161fb899856ef16efa609a5dce77b5f17a8f (diff) | |
| parent | 23bc11277cbb1e2f9a06ab357ac20106c9965b90 (diff) | |
| download | keyringer-65301e5129d9776a39de4e83d3f76be4c4d8749b.tar.gz keyringer-65301e5129d9776a39de4e83d3f76be4c4d8749b.tar.bz2 | |
Merge branch 'develop'
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/keyringer/actions/encrypt | 2 | ||||
| -rwxr-xr-x | lib/keyringer/actions/xclip | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/keyringer/actions/encrypt b/lib/keyringer/actions/encrypt index 1256374..f762f29 100755 --- a/lib/keyringer/actions/encrypt +++ b/lib/keyringer/actions/encrypt @@ -93,7 +93,7 @@ fi # Encrypt if [ "$UNENCRYPTED_FILE" != "-" ] && [ -d "$UNENCRYPTED_FILE" ]; then # Time to go recursive - BASEPATH="`basename $FILE .asc`" + BASEPATH="`echo $FILE | sed -e 's/.asc$//'`" FILEPATH="`dirname "$UNENCRYPTED_FILE"`" if [ "$FILEPATH" == "." ]; then diff --git a/lib/keyringer/actions/xclip b/lib/keyringer/actions/xclip index da86315..f63fdb5 100755 --- a/lib/keyringer/actions/xclip +++ b/lib/keyringer/actions/xclip @@ -4,8 +4,11 @@ # # Copy contents to clipboard. +# # Function thanks to Password Store by Jason A. Donenfeld <Jason@zx2c4.com> # distributed under GPLv2+: http://www.zx2c4.com/projects/password-store/ +# +# Adapted by rhatto clip() { # This base64 business is a disgusting hack to deal with newline inconsistancies # in shell. There must be a better way to deal with this, but because I'm a dolt, @@ -14,7 +17,15 @@ clip() { #local xclip="xclip -selection clipboard" local xclip="xclip" before="$($xclip -o | base64)" + + # Avoid "Error: target STRING not available" + # https://github.com/astrand/xclip/issues/38 + echo "$RANDOM" | $xclip + + # Copy text into clipboard echo -n "$1" | $xclip + + # Cleanup procedure ( sleep 45 now="$($xclip -o | base64)" |