diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-19 01:20:33 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-19 01:20:33 -0500 |
| commit | 4465c13b93d3d4bc1cb59c5506775b4fc0274058 (patch) | |
| tree | 31cf38794af37a7c3ef8e34a8d3e496449cf4aa7 /src/share/m | |
| parent | a7d9d68be60e5d46c016806a47227cd2f2e5a6c7 (diff) | |
tweak some of the prompting, to change defaults, and add PROMPT usage where missing
Diffstat (limited to 'src/share/m')
| -rw-r--r-- | src/share/m/gen_subkey | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/share/m/gen_subkey b/src/share/m/gen_subkey index 19d384d..d926ad5 100644 --- a/src/share/m/gen_subkey +++ b/src/share/m/gen_subkey @@ -86,12 +86,16 @@ Type '$PGRM help' for usage." fi # if authentication key is valid, prompt to continue if [ "$validity" = 'u' ] ; then - echo "A valid authentication key already exists for primary key '$keyID'." - read -p "Are you sure you would like to generate another one? (y/N) " OK; OK=${OK:N} - if [ "${OK/y/Y}" != 'Y' ] ; then + log error "A valid authentication key already exists for primary key '$keyID'." + if [ "$PROMPT" = "true" ] ; then + read -p "Are you sure you would like to generate another one? (y/N) " OK; OK=${OK:N} + if [ "${OK/y/Y}" != 'Y' ] ; then + failure "aborting." + fi + break + else failure "aborting." fi - break fi done |