summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/extra/passvar2
-rwxr-xr-xbin/guiscripts/keyadd10
2 files changed, 9 insertions, 3 deletions
diff --git a/bin/extra/passvar b/bin/extra/passvar
deleted file mode 100755
index b309ff4..0000000
--- a/bin/extra/passvar
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-pass show $PASSWORD
diff --git a/bin/guiscripts/keyadd b/bin/guiscripts/keyadd
index 53475dc..21a3668 100755
--- a/bin/guiscripts/keyadd
+++ b/bin/guiscripts/keyadd
@@ -4,6 +4,14 @@ die ()
echo "$1" >&2
}
+# For when script calls itself
+if [ -n "$PASSWORD" ]
+then
+ pass show "$PASSWORD" &&
+ exit
+ exit 1
+fi
+
key="$(find ~/.ssh -iname "*.pub" |
sed "s,$HOME/.ssh/,," |
cut -f1 -d. |
@@ -20,8 +28,8 @@ then
notify-send "$0" "delted <b>$key</b>"
elif ! ssh-add -l | grep -q "$(ssh-keygen -lf $HOME/.ssh/$key)"
then
- export SSH_ASKPASS="passvar"
export PASSWORD="keys/fl/ssh/$key"
+ export SSH_ASKPASS="$0"
ssh-add - < $HOME/.ssh/$key &&
notify-send "$0" "added <b>$key</b>"
else