From 63f41ad0edcb12449dbae5fd4315bec15b85ee46 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <ao2@ao2.it>
Date: Tue, 24 Oct 2017 13:15:41 +0200
Subject: [PATCH] bootstrap.sh: update the installation profile setting before
 installing

This fixes
a Drupal\Core\Installer\Exception\InstallProfileMismatchException
---
 libexec/bootstrap.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/libexec/bootstrap.sh b/libexec/bootstrap.sh
index 75f245c..d2ebda7 100755
--- a/libexec/bootstrap.sh
+++ b/libexec/bootstrap.sh
@@ -102,6 +102,15 @@ fi
 
 pushd "$SITE_LOCAL_PATH"
 
+chmod 755 sites/default
+chmod 644 sites/default/settings.php
+
+# Update the install_profile if it's already there
+if grep -q "^\\\$settings\['install_profile'\] =" sites/default/settings.php;
+then
+  sed -i -e "s/^\(\$settings\['install_profile'\]\) = '[^']*';/\1 = '$INSTALLATION_PROFILE';/g" sites/default/settings.php
+fi
+
 $DRUSH --verbose --yes \
   site-install \
   --db-su=root \
@@ -133,15 +142,6 @@ sudo chgrp -R "$WEB_SERVER_GROUP" sites/default/files
 # Enables clean URLs
 sed -i "s@# RewriteBase /drupal\$@RewriteBase ${SITE_BASE_PATH}@" .htaccess
 
-chmod 755 sites/default
-chmod 644 sites/default/settings.php
-
-# Update the install_profile if it's already there
-if grep -q "^\\\$settings\['install_profile'\] =" sites/default/settings.php;
-then
-  sed -i -e "s/^\(\$settings\['install_profile'\]\) = '[^']*';/\1 = '$INSTALLATION_PROFILE';/g" sites/default/settings.php
-fi
-
 # Add some basic settings to settings.php
 if ! grep -q "^\\\$settings\['trusted_host_patterns'\] =" sites/default/settings.php;
 then
-- 
2.1.4