Ejegg has submitted this change and it was merged.

Change subject: pushd to less crazy directory before running drush
......................................................................


pushd to less crazy directory before running drush

Setting the CWD to drupal/sites/default won't work in our case, cos
drupal/sites is a symlink.  Just stay in the drupal dir.

Bug: T78100
Change-Id: Ib3105974b76f3d738319295b46dcb331dd9ae84e
---
M app/config/wmff/install.sh
1 file changed, 58 insertions(+), 60 deletions(-)

Approvals:
  Ejegg: Verified; Looks good to me, approved



diff --git a/app/config/wmff/install.sh b/app/config/wmff/install.sh
index 5272932..0e1d29d 100644
--- a/app/config/wmff/install.sh
+++ b/app/config/wmff/install.sh
@@ -30,67 +30,65 @@
 
 ###############################################################################
 ## Extra configuration
-pushd "${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}" >> /dev/null
+pushd "$CMS_ROOT"
+drush -y en \
+  civicrm \
+  toolbar \
+  garland \
+  contribution_audit \
+  contribution_tracking \
+  devel \
+  environment_indicator \
+  exchange_rates \
+  ganglia_reporter \
+  globalcollect_audit \
+  large_donation \
+  log_audit \
+  offline2civicrm \
+  paypal_audit \
+  queue2civicrm \
+  queue2civicrm_tests \
+  recurring \
+  recurring_globalcollect \
+  twigext_l10n_tests \
+  syslog \
+  thank_you \
+  wmf_audit \
+  wmf_campaigns \
+  wmf_civicrm \
+  wmf_common \
+  wmf_communication \
+  wmf_communication_tests \
+  wmf_contribution_search \
+  wmf_fredge_qc \
+  wmf_logging \
+  wmf_refund_qc \
+  wmf_reports \
+  wmf_test_settings \
+  wmf_unsubscribe \
+  wmf_unsubscribe_qc \
+  wmf_zendesk_reports \
+  worldpay_audit
 
-  drush -y en \
-    civicrm \
-    toolbar \
-    garland \
-    contribution_audit \
-    contribution_tracking \
-    devel \
-    environment_indicator \
-    exchange_rates \
-    ganglia_reporter \
-    globalcollect_audit \
-    large_donation \
-    log_audit \
-    offline2civicrm \
-    paypal_audit \
-    queue2civicrm \
-    queue2civicrm_tests \
-    recurring \
-    recurring_globalcollect \
-    twigext_l10n_tests \
-    syslog \
-    thank_you \
-    wmf_audit \
-    wmf_campaigns \
-    wmf_civicrm \
-    wmf_common \
-    wmf_communication \
-    wmf_communication_tests \
-    wmf_contribution_search \
-    wmf_fredge_qc \
-    wmf_logging \
-    wmf_refund_qc \
-    wmf_reports \
-    wmf_test_settings \
-    wmf_unsubscribe \
-    wmf_unsubscribe_qc \
-    wmf_zendesk_reports \
-    worldpay_audit
+drush -y updatedb
 
-  drush -y updatedb
+## Setup theme
+#above# drush -y en garland
+export SITE_CONFIG_DIR
+drush -y -u "$ADMIN_USER" scr "$SITE_CONFIG_DIR/install-theme.php"
 
-  ## Setup theme
-  #above# drush -y en garland
-  export SITE_CONFIG_DIR
-  drush -y -u "$ADMIN_USER" scr "$SITE_CONFIG_DIR/install-theme.php"
+## Based on the block info, CRM_Core_Block::CREATE_NEW and CRM_Core_Block::ADD 
should be enabled by default, but they aren't.
+## "drush -y cc all" and "drush -y cc block" do *NOT* solve the problem. But 
this does:
+drush php-eval -u "$ADMIN_USER" 
'module_load_include("inc","block","block.admin"); block_admin_display();'
 
-  ## Based on the block info, CRM_Core_Block::CREATE_NEW and 
CRM_Core_Block::ADD should be enabled by default, but they aren't.
-  ## "drush -y cc all" and "drush -y cc block" do *NOT* solve the problem. But 
this does:
-  drush php-eval -u "$ADMIN_USER" 
'module_load_include("inc","block","block.admin"); block_admin_display();'
-
-  ## Setup demo user
-  drush -y en civicrm_webtest
-  drush -y user-create --password="$DEMO_PASS" --mail="$DEMO_EMAIL" 
"$DEMO_USER"
-  #drush -y user-add-role civicrm_webtest_user "$DEMO_USER"
-  # In Garland, CiviCRM's toolbar looks messy unless you also activate 
Drupal's "toolbar", so grant "access toolbar"
-  # We've activated more components than typical web-test baseline, so grant 
rights to those components.
-  #for perm in 'access toolbar'
-  #do
-  #  drush -y role-add-perm civicrm_webtest_user "$perm"
-  #done
-
-popd >> /dev/null
+## Setup demo user
+drush -y en civicrm_webtest
+drush -y user-create --password="$DEMO_PASS" --mail="$DEMO_EMAIL" "$DEMO_USER"
+#drush -y user-add-role civicrm_webtest_user "$DEMO_USER"
+# In Garland, CiviCRM's toolbar looks messy unless you also activate Drupal's 
"toolbar", so grant "access toolbar"
+# We've activated more components than typical web-test baseline, so grant 
rights to those components.
+#for perm in 'access toolbar'
+#do
+#  drush -y role-add-perm civicrm_webtest_user "$perm"
+#done
+popd

-- 
To view, visit https://gerrit.wikimedia.org/r/195010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3105974b76f3d738319295b46dcb331dd9ae84e
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/civicrm-buildkit
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: AndyRussG <andrew.green...@gmail.com>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Katie Horn <kh...@wikimedia.org>
Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to