Commit 5ea447f0 authored by Adrian Rossouw's avatar Adrian Rossouw Committed by adrian

Include additional information about install profiles, such as the human...

Include additional information about install profiles, such as the human friendly name and description
parent f827b5c2
......@@ -338,14 +338,10 @@ function provision_drupal_provision_verify($url, &$data) {
provision_path("writable", "sites", true, t("Drupal sites directory is writable by the provisioning script"),
t("Drupal sites directory is not writable by the provisioning script"), PROVISION_PERM_ERROR);
$exists = _provision_create_dir(PROVISION_DRUSHRC_PATH, t('Drush configuration path'), 0700);
$profiles = file_scan_directory('./profiles', '\.profile$', array('.', '..', 'CVS', '.svn'), 0, TRUE, 'name', 0);
$data['profiles'] = $profiles;
$data['modules'] = _provision_drupal_get_cvs_versions(module_rebuild_cache());
// Find theme engines
$data['engines'] = drupal_system_listing('\.engine$', 'themes/engines');
$data['profiles'] = _provision_find_profiles();
$data['themes'] = system_theme_data();
$sites = provision_drupal_find_sites();
......@@ -353,6 +349,26 @@ function provision_drupal_provision_verify($url, &$data) {
$data['sites'] = array_keys($sites); // return list of hosted sites. used to determine whether or not to import.
}
/**
* Find available profiles on this platform.
*/
function _provision_find_profiles() {
include_once('includes/install.inc');
$profiles = file_scan_directory('./profiles', '\.profile$', array('.', '..', 'CVS', '.svn'), 0, TRUE, 'name', 0);
foreach ($profiles as $key => $profile) {
require_once($profile->filename);
$func = $profile->name . "_profile_details";
if (function_exists($func)) {
$profile->info = $func();
}
$return[$key] = $profile;
}
return $return;
}
/**
* Remove any directories for the site in sites
* This can't be rolled back. so won't even try.
......
......@@ -31,7 +31,7 @@ function provision_apache_help($section) {
function _provision_config_path_requirements() {
$username = PROVISION_SCRIPT_USER;
$group = PROVISION_WEB_GROUP;
$vhost_path = PROVISION_VHOST_PATH;
$vhost_path = PROVISION_CONFIG_PATH;
$mkdir_cmd['@vhost_path'] = $vhost_path;
$mkdir_cmd['@provision_link'] = url('admin/settings/provision');
$mkdir_cmd['@mkdir_cmd'] = <<<EOF
......
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