aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-02-19 23:42:29 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-02-19 23:42:29 -0300
commit04b03dd14a0abe02f436f86e3d647f97b3e5522b (patch)
tree43f7a6d8f957f1d2d117b95ef2db73af174a7252 /lib
parent9b26f57a726ccb582f41c19c7c3bbcef3225c12d (diff)
downloadkeyringer-04b03dd14a0abe02f436f86e3d647f97b3e5522b.tar.gz
keyringer-04b03dd14a0abe02f436f86e3d647f97b3e5522b.tar.bz2
Adding xclip action thanks to password-store (2)
Diffstat (limited to 'lib')
-rwxr-xr-xlib/keyringer/actions/xclip6
-rw-r--r--lib/keyringer/completions/bash/keyringer2
-rw-r--r--lib/keyringer/completions/zsh/_keyringer2
3 files changed, 8 insertions, 2 deletions
diff --git a/lib/keyringer/actions/xclip b/lib/keyringer/actions/xclip
index 414013b..b28984f 100755
--- a/lib/keyringer/actions/xclip
+++ b/lib/keyringer/actions/xclip
@@ -38,6 +38,12 @@ clip() {
LIB="`dirname $0`/../functions"
source "$LIB" || exit 1
+# Check for xclip
+if ! which xclip; then
+ echo "fatal: xclip not found"
+ exit 1
+fi
+
# Get file
keyringer_get_file "$2"
diff --git a/lib/keyringer/completions/bash/keyringer b/lib/keyringer/completions/bash/keyringer
index eb8fabd..a640583 100644
--- a/lib/keyringer/completions/bash/keyringer
+++ b/lib/keyringer/completions/bash/keyringer
@@ -94,7 +94,7 @@ _keyringer() {
recipients)
opts="ls edit"
;;
- ls|tree|mkdir|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|rm|recrypt|open)
+ ls|tree|mkdir|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|rm|recrypt|open|clip|xclip)
cur="`echo ${cur} | sed -e "s|^/*||"`" # avoid leading slash
opts="$(bash -c "set -f && export KEYRINGER_CHECK_VERSION=false && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
;;
diff --git a/lib/keyringer/completions/zsh/_keyringer b/lib/keyringer/completions/zsh/_keyringer
index e889fd8..1a6d8c6 100644
--- a/lib/keyringer/completions/zsh/_keyringer
+++ b/lib/keyringer/completions/zsh/_keyringer
@@ -50,7 +50,7 @@ _keyringer() {
recipients)
compadd "$@" ls edit
;;
- ls|tree|mkdir|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|rm|recrypt|open)
+ ls|tree|mkdir|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|rm|recrypt|open|clip|xclip)
words[4]="`echo $words[4] | sed -e "s|^/*||"`" # avoid leading slash
compadd "$@" $(KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[4]'*' 2> /dev/null)
;;