summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/common/askpass5
-rwxr-xr-xbin/menuscripts/keyadd7
2 files changed, 8 insertions, 4 deletions
diff --git a/bin/common/askpass b/bin/common/askpass
index ebd833c..c7d2249 100755
--- a/bin/common/askpass
+++ b/bin/common/askpass
@@ -12,5 +12,6 @@ key="$(printf '%s\n' "$1" |
pass="keys/$(hostname)/ssh/$key"
# optional: add key to running ssh-agent
-keyadd "$key" &&
- pass show "$pass" | head -n 1
+keyadd "$key" &
+
+pass show "$pass" | head -n 1
diff --git a/bin/menuscripts/keyadd b/bin/menuscripts/keyadd
index 5a38bfb..fb7e66e 100755
--- a/bin/menuscripts/keyadd
+++ b/bin/menuscripts/keyadd
@@ -2,8 +2,11 @@
log()
{
- herbe "keyadd" "$1" &
- >&2 printf '%s\n' "$1"
+ if [ "${Logging:-1}" -eq 1 ]
+ then
+ herbe "keyadd" "$1" &
+ >&2 printf '%s\n' "$1"
+ fi
}
SSHFOLDER="$HOME/.ssh"