From b6d24c61907994e13763af19581c48ebffde82f3 Mon Sep 17 00:00:00 2001 From: rhatto Date: Mon, 9 Oct 2006 14:01:15 +0000 Subject: small fixes --- firma | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'firma') diff --git a/firma b/firma index d003c9b..51edd34 100755 --- a/firma +++ b/firma @@ -1155,7 +1155,7 @@ function CheckValidEmail { # 1 if not #------------------------------------------------------------- - if ! echo $2 | grep -q '[^@]\+@[^@]\+'; then + if ! echo $1 | grep -q '[^@]\+@[^@]\+'; then return 1 else return 0 @@ -1177,8 +1177,6 @@ function UnsubscribeUser { local key local -i return_code=0 local keyid="$($GPG_LIST_KEYS --with-fingerprint $1 2> /dev/null | grep ^fpr | cut -d : -f 10)" - local uid_count="$($GPG_LIST_KEYS --fixed-list-mode $keyid 2> /dev/null | grep ^uid | wc -l)" - local chosen_uid_number="$($GPG_LIST_KEYS --fixed-list-mode $keyid 2> /dev/null | grep ^uid | grep -ni "$1" | cut -d : -f 1)" if [ "$1" == "$LIST_ADDRESS" ]; then # check if user is trying to unsubscribe the list key -- cgit v1.2.3