aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto>2006-10-10 02:36:27 +0000
committerrhatto <rhatto>2006-10-10 02:36:27 +0000
commitda14037185cc815ba10f417115eab2eb17613aa9 (patch)
treef2e3550edf17c913e9791c3dcb5a162fcc4b3ec9
parent4fa9f0d127bc0d7f397abbe95c7fe045a8ea4c54 (diff)
downloadfirma-da14037185cc815ba10f417115eab2eb17613aa9.tar.gz
firma-da14037185cc815ba10f417115eab2eb17613aa9.tar.bz2
NewList minor fixes
-rwxr-xr-xfirma10
1 files changed, 6 insertions, 4 deletions
diff --git a/firma b/firma
index cd9b753..47a6428 100755
--- a/firma
+++ b/firma
@@ -979,8 +979,9 @@ function NewList {
digits_only="`echo "$SUBKEY_VALIDITY" | sed -e "s/$last_char.$//"`"
if [ -z "$KEY_EXPIRATION" ]; then
KEY_EXPIRATION="0"
+ break
elif [ "$KEY_EXPIRATION" == "quit" ]; then
- return 1
+ return_code=1
elif [ -z "`echo $digits_only | sed -e 's/[0-9]//g'`" ] || [ ! -z "$last_char" ]; then
break
else
@@ -1030,9 +1031,8 @@ EOF
while true; do
read -rep " Please enter your choice: " answer
if [ "$answer" != "1" ]; then
- method="keyserver"
read -rep " Please enter the keyserver address (defaults to $KEYSERVER): " answer
- method="$method $answer"
+ method="keyserver $answer"
break
elif [ "$answer" != "2" ]; then
method="stdin"
@@ -1087,6 +1087,8 @@ EOF
# list creation should be atomic
if [ "$return_code" == "1" ]; then
rm -rf $LIST_HOMEDIR
+ else
+ echo "List creation complete."
fi
return $return_code
@@ -1508,7 +1510,7 @@ function SubscribeUsers {
return_code=1
fi
- FixListOwnerShip
+ FixListOwnership
return $return_code
}