From 7efd2804ab5ec85669ee8ca8fc00df68dce3277d Mon Sep 17 00:00:00 2001
From: Antonio Ospite <ao2@ao2.it>
Date: Mon, 27 Aug 2018 15:53:54 +0200
Subject: [PATCH] bootstrap.sh: fix setting the --uri option for Drush 9

Set the --uri option in Drush 9.

This is basically a port of commit 9d37dad (bootstrap.sh: set the drush
--uri option, 2018-03-16) for Drush 9.
---
 libexec/bootstrap.sh | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/libexec/bootstrap.sh b/libexec/bootstrap.sh
index ca374c4..9dc149f 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,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 \
-- 
2.1.4