aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto>2006-10-09 17:28:44 +0000
committerrhatto <rhatto>2006-10-09 17:28:44 +0000
commitcbc3d109e8e4a70834e1ae072f4467b9f61f92dd (patch)
tree996fa3e75b993b69a23d218a72a6b5e3905a3621
parent40a70afaf7a64548ffd363e7a50461fd0b309ea9 (diff)
downloadfirma-cbc3d109e8e4a70834e1ae072f4467b9f61f92dd.tar.gz
firma-cbc3d109e8e4a70834e1ae072f4467b9f61f92dd.tar.bz2
small fixes
-rwxr-xr-xfirma8
1 files changed, 6 insertions, 2 deletions
diff --git a/firma b/firma
index 5fc1f01..f9e5f85 100755
--- a/firma
+++ b/firma
@@ -1218,7 +1218,7 @@ function UnsubscribeUser {
local keyid="$($GPG_LIST_KEYS --with-fingerprint $1 2> /dev/null | grep ^fpr | cut -d : -f 10)"
# check if its a valid email
- if ! ValidEmail $1; then
+ if ! CheckValidEmail $1; then
echo >&2 "unsub: \"$1\" is not an email address."
return_code=1
# check if user is trying to unsubscribe the list key
@@ -1407,6 +1407,7 @@ function GetSubscribersInfo {
local key
local keys
+ local keyid
if [ "$1" == "help" ]; then
echo "usage: info [all|email|help]"
@@ -1420,7 +1421,10 @@ function GetSubscribersInfo {
fi
for key in keys; do
- $GPG --list-keys $key
+ keyid="$($GPG_LIST_KEYS --with-fingerprint $1 2> /dev/null | grep ^fpr | cut -d : -f 10)"
+ if [ ! -z "$keyid" ]; then
+ $GPG --list-keys $key
+ fi
done
return $?