Commit aa140401 authored by anarcat's avatar anarcat Committed by Steven Jones

refactor the email setting code so that we have a proper default and

we discard a temporary variable
parent 5862ce8c
...@@ -50,9 +50,9 @@ Don't worry: you will get to review those settings after the final install"); ...@@ -50,9 +50,9 @@ Don't worry: you will get to review those settings after the final install");
} else { } else {
$default_email = 'webmaster@' . drush_get_option('aegir_host'); $default_email = 'webmaster@' . drush_get_option('aegir_host');
} }
drush_set_default('client_email', $default_email);
while (!filter_var(drush_get_option('client_email'), FILTER_VALIDATE_EMAIL) && !drush_get_context('DRUSH_AFFIRMATIVE')) { while (!filter_var(drush_get_option('client_email'), FILTER_VALIDATE_EMAIL) && !drush_get_context('DRUSH_AFFIRMATIVE')) {
$client_email = drush_prompt(dt("Admin user e-mail"), $default_email); drush_set_option('client_email', drush_prompt(dt("Admin user e-mail"), $default_email));
drush_set_option('client_email', $client_email);
} }
drush_print(dt(' drush_print(dt('
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment