From f55dc38b3449a995aa1c1f388b9c522023c9d8d5 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <ao2@ao2.it>
Date: Thu, 21 Dec 2017 12:58:11 +0100
Subject: [PATCH] bootstrap.sh: always update RewriteBase

Cover the case of bootstrapping a site a second time without cleaning
the web/ directory when the user changed the value of SITE_BASE_PATH in
bootstrap.conf: be sure to propagated the change to the .htaccess file.
---
 libexec/bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libexec/bootstrap.sh b/libexec/bootstrap.sh
index 4670cef..edf8314 100755
--- a/libexec/bootstrap.sh
+++ b/libexec/bootstrap.sh
@@ -150,7 +150,7 @@ sudo chgrp -R "$WEB_SERVER_GROUP" sites/default/files
 [ -d ../config/sync ] && sudo chgrp -R "$WEB_SERVER_GROUP" ../config/sync
 
 # Enables clean URLs
-sed -i "s@# RewriteBase /drupal\$@RewriteBase ${SITE_BASE_PATH}@" .htaccess
+sed -i "s@\(# \)\{0,1\}RewriteBase .*\$@RewriteBase ${SITE_BASE_PATH}@" .htaccess
 
 chmod 755 sites/default
 chmod 644 sites/default/settings.php
-- 
2.1.4