Skip to content

Commit

Permalink
Merge pull request #27 from LionsAd/split-module-linked
Browse files Browse the repository at this point in the history
[Bug] Fix ensure_module by splitting in linking and enabling step.
  • Loading branch information
LionsAd committed Jul 25, 2015
2 parents d4845bf + d4b045e commit 03d3e16
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions functions/drupal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ function drupal_ti_ensure_drupal() {
}

#
# Ensures that the module is linked into the Drupal code base
# and enabled.
# Ensures that the module is linked into the Drupal code base.
#
function drupal_ti_ensure_module() {
function drupal_ti_ensure_module_linked() {
# Ensure we are in the right directory.
cd "$DRUPAL_TI_DRUPAL_DIR"

Expand All @@ -55,6 +54,16 @@ function drupal_ti_ensure_module() {

# Point module into the drupal installation.
ln -sf "$MODULE_DIR" "$DRUPAL_TI_MODULES_PATH/$DRUPAL_TI_MODULE_NAME"
}


#
# Ensures that the module is linked into the Drupal code base
# and enabled.
#
function drupal_ti_ensure_module() {
# Ensure the module is linked into the code base.
drupal_ti_ensure_module_linked

# Enable it to download dependencies.
drush --yes en "$DRUPAL_TI_MODULE_NAME"
Expand Down

0 comments on commit 03d3e16

Please sign in to comment.