Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/drupal#161 - Remove drush sample data install option that doesn't work #648

Merged
merged 1 commit into from
Aug 10, 2021
Merged

dev/drupal#161 - Remove drush sample data install option that doesn't work #648

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions drush/civicrm.drush.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ function civicrm_drush_command() {
'langtarfile' => 'Path to your l10n tar.gz file.',
'site_url' => 'Base Url for your drupal/CiviCRM website without http (e.g. mysite.com)',
'ssl' => 'Using ssl for your drupal/CiviCRM website if set to on (e.g. --ssl=on)',
'load_generated_data' => 'Loads the demo generated data. Defaults to FALSE.',
],
'aliases' => ['cvi'],
];
Expand Down Expand Up @@ -309,7 +308,6 @@ function drush_civicrm_install() {
$drupalRoot = drush_get_context('DRUSH_DRUPAL_ROOT');
$modPath = "$drupalRoot/$crmpath";
$lang = drush_get_option('lang', '');
$loadGeneratedData = drush_get_option('load_generated_data', FALSE);

if (!is_dir("$modPath/civicrm")) {
// extract tarfile at right place
Expand All @@ -333,7 +331,7 @@ function drush_civicrm_install() {
}

// install database
_civicrm_install_db($dbuser, $dbpass, $dbhost, $dbname, $modPath, $lang, $loadGeneratedData);
_civicrm_install_db($dbuser, $dbpass, $dbhost, $dbname, $modPath, $lang);

// generate civicrm.settings.php file
_civicrm_generate_settings_file($dbuser, $dbpass, $dbhost, $dbname, $modPath);
Expand All @@ -352,7 +350,7 @@ function _civicrm_extract_tarfile($destinationPath, $option = 'tarfile') {
}

function _civicrm_install_db($dbuser, $dbpass, $dbhost, $dbname,
$modPath, $lang, $loadGeneratedData
$modPath, $lang
) {
$drupalRoot = drush_get_context('DRUSH_DRUPAL_ROOT');
$siteRoot = drush_get_context('DRUSH_DRUPAL_SITE_ROOT', FALSE);
Expand Down Expand Up @@ -400,9 +398,6 @@ function _civicrm_install_db($dbuser, $dbpass, $dbhost, $dbname,
civicrm_source($dsn, $data_file);
civicrm_source($dsn, $acl_file);

if ($loadGeneratedData) {
civicrm_source($dsn, $sqlPath . DIRECTORY_SEPARATOR . 'civicrm_generated.mysql', TRUE);
}
drush_log(dt('CiviCRM database loaded successfully.'), 'ok');
}

Expand Down