aboutsummaryrefslogtreecommitdiff
path: root/lib/bash/functions
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-01-03 19:50:51 -0200
committerSilvio Rhatto <rhatto@riseup.net>2012-01-03 19:50:51 -0200
commite32f88eaea694f7f0befa283df128a4dcd94aaa4 (patch)
treee725dec17443f4deba5b5ff4cd7d0700e5199b3a /lib/bash/functions
parentfc4741eb7f96d94ce8de70d9e5082a294cc30202 (diff)
parenteb9fc837e97d4be9275a6ec07ebcab1a660bbcd8 (diff)
downloadkeyringer-e32f88eaea694f7f0befa283df128a4dcd94aaa4.tar.gz
keyringer-e32f88eaea694f7f0befa283df128a4dcd94aaa4.tar.bz2
Merge branch 'master' into ruby
Diffstat (limited to 'lib/bash/functions')
-rw-r--r--lib/bash/functions6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/bash/functions b/lib/bash/functions
index 11d1b86..58f7ad1 100644
--- a/lib/bash/functions
+++ b/lib/bash/functions
@@ -204,6 +204,12 @@ function keyringer_set_env {
exit 1
fi
+ if [ ! -z "$KEYID" ]; then
+ GPG="gpg -u $KEYID"
+ else
+ GPG="gpg"
+ fi
+
# Check recipients file
keyringer_check_recipients $SUBCOMMAND