Commit 5f34faf4 authored by Jon Pugh's avatar Jon Pugh

Issue #2754069: Default to "profile" method. If "manual" method, set...

Issue #2754069: Default to "profile" method.  If "manual" method, set "login_link" to be to /install.php.
parent d99ebb87
......@@ -59,8 +59,13 @@ function drush_provision_drupal_provision_install() {
drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_SITE);
// Install site according to site_install_method.
drush_log(dt('Installing site with the "!method" method.', array(
'!method' => drush_get_option('site_install_method', 'profile'),
)), 'ok');
// Run Drupal installation if option was specified
if (drush_get_option('site_install_method', 'profile')) {
if (drush_get_option('site_install_method', 'profile') == 'profile') {
// call a backend task to do the actual installation.
$result = provision_backend_invoke(d()->name, "provision-install-backend", array(), array('client_email' => drush_get_option('client_email')));
......@@ -70,8 +75,8 @@ function drush_provision_drupal_provision_install() {
drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_FULL);
drush_set_option('installed', TRUE, 'site');
}
else {
drush_log('skipping install due to missing drush option', 'devshop_log');
elseif (drush_get_option('site_install_method', 'profile') == 'manual') {
drush_set_option('login_link', 'http://' . d()->uri . '/install.php');
}
_provision_drupal_maintain_aliases();
......
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