From 9d19d72cfc995a307d7168732c16788aa1428184 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Tue, 24 Oct 2017 12:53:18 +0200 Subject: [PATCH] bootstrap.sh: allow re-bootstrapping with a different installation profile --- libexec/bootstrap.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libexec/bootstrap.sh b/libexec/bootstrap.sh index 74547af..ff69fb0 100755 --- a/libexec/bootstrap.sh +++ b/libexec/bootstrap.sh @@ -133,8 +133,15 @@ 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 @@ -152,10 +159,8 @@ then composer --working-dir=../ require drupal/devel $DRUSH --yes en devel - chmod 755 sites/default cp sites/example.settings.local.php sites/default/settings.local.php chmod 444 sites/default/settings.local.php - chmod 555 sites/default if ! grep -q "^include \$app_root . '/' . \$site_path . '/settings.local.php';" sites/default/settings.php; then @@ -164,6 +169,7 @@ then fi chmod 444 sites/default/settings.php +chmod 555 sites/default # If using a git checkout of Drupal core, set up a diff alias. # -- 2.1.4