Commit bbcb055d authored by Adrian Rossouw's avatar Adrian Rossouw

Merge branch 'master' into dev-services

Conflicts:
	install.sh.txt
parents cc007792 13a92f65
......@@ -37,8 +37,8 @@ Shell commands::
export AEGIR_VERSION=HEAD
export DRUPAL_DIR=/var/aegir/hostmaster-$AEGIR_VERSION
export OLD_DRUPAL_DIR=/var/aegir/drupal-6.14
export DRUSH_VERSION=All-versions-3.0-beta1
export OLD_DRUPAL_DIR=/var/aegir/hostmaster-0.4-alpha6
export DRUSH_VERSION=All-versions-3.0-rc4
export DRUSH_MAKE_VERSION=6.x-2.0-beta6
This document also assumes drush is installed properly and we use an
......
......@@ -34,7 +34,6 @@ AEGIR_DOMAIN=aegir.example.com
AEGIR_VERSION=HEAD
AEGIR_HOME=$HOME
WEB_GROUP=www-data
# doesn't exist yet, but we need drush_prompt in HEAD
DRUSH_VERSION=All-versions-3.0-rc4
DRUSH_MAKE_VERSION=6.x-2.0-beta6
CLIENT_EMAIL="you@example.com"
......
......@@ -90,13 +90,13 @@ function install_mail($key, &$message, $params) {
function install_main() {
global $profile, $install_locale, $client_email, $conf, $url, $base_url;
require_once('install.php');
require_once DRUPAL_ROOT . '/includes/install.core.inc';
drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_CONFIGURATION);
// We have an existing settings.php.
$db_spec = _drush_sql_get_db_spec();
$db_spec = drush_core_site_install_db_spec();
$db_spec['db_prefix'] = $GLOBALS['db_prefix'];
if ($db_spec['driver'] == 'mysqli') {
......
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