diff options
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/keyringer/actions/edit | 6 | ||||
| -rwxr-xr-x | lib/keyringer/actions/xclip | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/keyringer/actions/edit b/lib/keyringer/actions/edit index a480eea..ae4f4b0 100755 --- a/lib/keyringer/actions/edit +++ b/lib/keyringer/actions/edit @@ -24,6 +24,12 @@ keyringer_set_tmpfile $BASENAME.$EXTENSION # Decrypt the information to the file $GPG --yes -o "$TMPWORK" --use-agent -d "$KEYDIR/$FILE" +# Check whether decryption suceeded +if [ "$?" != "0" ]; then + echo "Error decrypting $FILE, aborting" + exit 1 +fi + # Action check if [ "$BASENAME" == "edit" ]; then APP="$EDITOR" diff --git a/lib/keyringer/actions/xclip b/lib/keyringer/actions/xclip index 0e36dae..ff82cc1 100755 --- a/lib/keyringer/actions/xclip +++ b/lib/keyringer/actions/xclip @@ -16,14 +16,14 @@ clip() { #local xclip="xclip -selection clipboard" local xclip="xclip" - before="$($xclip -o | base64)" + before="$($xclip -o 2> /dev/null | base64)" # Avoid "Error: target STRING not available" # https://github.com/astrand/xclip/issues/38 echo "$RANDOM" | $xclip &> /dev/null # Copy text into clipboard - echo -n "$1" | $xclip + echo -n "$1" | $xclip &> /dev/null # Cleanup procedure ( @@ -42,7 +42,7 @@ clip() { # so we axe it here: qdbus org.kde.klipper /klipper org.kde.klipper.klipper.clearClipboardHistory &>/dev/null - echo "$before" | base64 -d | $xclip + echo "$before" | base64 -d | $xclip 2> /dev/null ) & disown echo "Copied $2 to clipboard. Will clear in 45 seconds." } |