tweaked the key expiration checking function, and replied to SJJ's bug

[monkeysphere.git] / src / common

diff --git a/src/common b/src/common
index 44bdb670f515384646bd6d92a5f11ad6e6b5329a..d90730ff7887f8f753567f73b16ef780ae9181ae 100644 (file)
--- a/src/common
+++ b/src/common
@@ -85,9 +85,12 @@ gpg_escape() {
 
 # prompt for GPG-formatted expiration, and emit result on stdout
 get_gpg_expiration() {
-    local keyExpire=
+    local keyExpire
 
-    cat >&2 <<EOF
+    keyExpire="$1"
+
+    if [ -z "$keyExpire" ]; then
+       cat >&2 <<EOF
 Please specify how long the key should be valid.
          0 = key does not expire
       <n>  = key expires in n days
@@ -95,13 +98,17 @@ Please specify how long the key should be valid.
       <n>m = key expires in n months
       <n>y = key expires in n years
 EOF
-    while [ -z "$keyExpire" ] ; do
-       read -p "Key is valid for? (0) " keyExpire
-       if ! test_gpg_expire ${keyExpire:=0} ; then
-           echo "invalid value" >&2
-           unset keyExpire
-       fi
-    done
+       while [ -z "$keyExpire" ] ; do
+           read -p "Key is valid for? (0) " keyExpire
+           if ! test_gpg_expire ${keyExpire:=0} ; then
+               echo "invalid value" >&2
+               unset keyExpire
+           fi
+       done
+    elif ! test_gpg_expire "$keyExpire" ; then
+       failure "invalid key expiration value '$keyExpire'."
+    fi
+       
     echo "$keyExpire"
 }