X-Git-Url: https://git.ao2.it/drupal-init-tools.git/blobdiff_plain/9d37dad0c9bca625327c3b87071300dffe1839dc..HEAD:/libexec/bootstrap.sh

diff --git a/libexec/bootstrap.sh b/libexec/bootstrap.sh
index ca374c4..b599825 100755
--- a/libexec/bootstrap.sh
+++ b/libexec/bootstrap.sh
@@ -140,7 +140,19 @@ then
   fi
 fi
 
-pushd "$WEB_ROOT"
+# 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" > /dev/null
 
 # Update the install_profile setting if it's already there
 if grep -q "^\\\$settings\['install_profile'\] =" sites/default/settings.php;
@@ -152,25 +164,6 @@ then
   chmod 555 sites/default
 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().
-chmod 755 sites/default
-if [ ! -e sites/default/drushrc.php ];
-then
-  echo "<?php" > sites/default/drushrc.php
-  echo "" >> sites/default/drushrc.php
-fi
-
-if grep -q "^\\\$options\['uri'\] =" sites/default/drushrc.php;
-then
-  sed -i -e "s@^\(\$options\['uri'\]\) = '[^']*';@\1 = 'http://localhost/${SITE_BASE_PATH}';@g" sites/default/drushrc.php
-else
-  echo "\$options['uri'] = 'http://localhost/${SITE_BASE_PATH}';" >> sites/default/drushrc.php
-fi
-chmod 444 sites/default/drushrc.php
-chmod 555 sites/default
-
 # Install the site
 $DRUSH --verbose --yes \
   site-install \
@@ -200,8 +193,8 @@ sudo chgrp -R "$WEB_SERVER_GROUP" sites/default/files
 
 [ -d ../config/sync ] && sudo chgrp -R "$WEB_SERVER_GROUP" ../config/sync
 
-# Enable clean URLs
-sed -i "s@\(# \)\{0,1\}RewriteBase .*\$@RewriteBase ${SITE_BASE_PATH}@" .htaccess
+# Don't force RewriteBase it is not generally needed
+#sed -i "s@RewriteBase /drupal\$@RewriteBase ${SITE_BASE_PATH}@" .htaccess
 
 chmod 755 sites/default
 chmod 644 sites/default/settings.php
@@ -250,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
+popd > /dev/null