diff --git a/platform/install.provision.inc b/platform/install.provision.inc index adfe6a3..7c093b0 100644 --- a/platform/install.provision.inc +++ b/platform/install.provision.inc @@ -18,8 +18,8 @@ function drush_provision_drupal_provision_install_validate() { if (!d()->uri) { return drush_set_error("PROVISION_URL_REQUIRED", dt("You need to specify a valid url to install a site")); } - if (_provision_drupal_site_exists()) { - return drush_set_error('PROVISION_SITE_INSTALLED'); + if (drush_bootstrap_max() == DRUSH_BOOTSTRAP_DRUPAL_LOGIN) { + return drush_set_error('PROVISION_SITE_INSTALLED', dt('This site has already been installed.')); } } diff --git a/platform/provision_drupal.drush.inc b/platform/provision_drupal.drush.inc index 05a4977..4f49905 100644 --- a/platform/provision_drupal.drush.inc +++ b/platform/provision_drupal.drush.inc @@ -72,16 +72,6 @@ function provision_drupal_drush_exit() { } /** - * Test to see if the site settings.php exists - * - * @return - * If the file exists, return TRUE, else return FALSE. - */ -function _provision_drupal_site_exists() { - return is_readable(d()->site_path . '/settings.php'); -} - -/** * This command does the actual installation in it's own thread, * so we can recover gracefully if things go really wrong. */