X-Git-Url: https://git.ao2.it/drupal-init-tools.git/blobdiff_plain/e7bc3fbe35e1c90cb8dbaf31e3875f99d448f654..753d330f19438d3d675421e1ffb292cfbaa5dc52:/libexec/bootstrap.sh

diff --git a/libexec/bootstrap.sh b/libexec/bootstrap.sh
index 9975299..bb1968e 100755
--- a/libexec/bootstrap.sh
+++ b/libexec/bootstrap.sh
@@ -140,6 +140,18 @@ then
   fi
 fi
 
+# Make sure that drush knows what the actual base URI is, this is needed to
+# have a consistent behavior between the cli and the web interface, for
+# example in the case of modules that use base_path().
+if grep -q "^[[:space:]]*uri:" drush/drush.yml;
+then
+  sed -i -e "s@^\([[:space:]]*\)uri: .*@\1uri: 'http://localhost/${SITE_BASE_PATH}'@g" drush/drush.yml
+else
+  echo "" >> drush/drush.yml
+  echo "options:" >> drush/drush.yml
+  echo "  uri: 'http://localhost/${SITE_BASE_PATH}'" >> drush/drush.yml
+fi
+
 pushd "$WEB_ROOT"
 
 # Update the install_profile setting if it's already there
@@ -152,12 +164,14 @@ then
   chmod 555 sites/default
 fi
 
+# Install the site
 $DRUSH --verbose --yes \
   site-install \
   "${DRUSH_DB_SU_CREDENTIALS[@]}" \
   --db-url="mysql://${DB_USER}:${DB_PASS}@localhost/${DB_NAME}" \
   --site-name="$SITE_NAME" \
   --site-mail="$SITE_MAIL" \
+  --sites-subdir="default" \
   --account-name="$ACCOUNT_NAME" \
   --account-pass="$ACCOUNT_PASS" \
   --account-mail="$ACCOUNT_MAIL" \
@@ -229,8 +243,10 @@ chmod 555 sites/default
 if [ -d core/.git ];
 then
   git -C core/ config --local alias.core-diff "diff --src-prefix=a/core/ --dst-prefix=b/core/"
-  echo "Added a 'git core-diff' command to the drupal/core repository clone."
-  echo "This command helps creating core patches ready for upstream."
+  git -C core/ config --local alias.core-format-patch "format-patch --src-prefix=a/core/ --dst-prefix=b/core/"
+  echo "Added 'git core-diff' and 'git core-format-patch' commands to the drupal/core"
+  echo "repository clone. These commands help creating core patches ready for upstream"
+  echo "in a split-core setup."
 fi
 
 popd