X-Git-Url: https://git.ao2.it/drupal-init-tools.git/blobdiff_plain/106efabf4921c83be87587075dc758d46f758ad5..f4f92c2b7ddb36cda3da9a529a3118ee06455be4:/libexec/bootstrap.sh diff --git a/libexec/bootstrap.sh b/libexec/bootstrap.sh index 9445a55..1f3b160 100755 --- a/libexec/bootstrap.sh +++ b/libexec/bootstrap.sh @@ -119,8 +119,8 @@ DRUPAL_CONSOLE="${PWD}/vendor/bin/drupal" [ -x "$DRUSH" ] || { echo "Aborting, '$DRUSH' not available." 1>&2; exit 1; } [ -x "$DRUPAL_CONSOLE" ] || { echo "Aborting, '$DRUPAL_CONSOLE' not available." 1>&2; exit 1; } -# This becomes unnecessary if the installation profile gets pulled in by -# composer.json, like suggested in +# The following becomes unnecessary if the installation profile gets pulled in +# by composer.json, like suggested in # https://github.com/drupal-composer/drupal-project/issues/249 if ! echo "$INSTALLATION_PROFILE" | grep -q -E "^(minimal|standard)$"; then @@ -130,13 +130,19 @@ then echo "Use --overwrite-profile to copy over it." 1>&2 exit 1 else - cp -a "$INSTALLATION_PROFILE" "${WEB_ROOT}/profiles" + if [ -d "$INSTALLATION_PROFILE" ]; + then + cp -a "$INSTALLATION_PROFILE" "${WEB_ROOT}/profiles" + else + echo "Local installation profile '$INSTALLATION_PROFILE' not found." 1>&2 + echo "Cannot honour the --overwrite-profile option." 1>&2 + fi fi fi pushd "$WEB_ROOT" -# Update the install_profile if it's already there +# Update the install_profile setting if it's already there if grep -q "^\\\$settings\['install_profile'\] =" sites/default/settings.php; then chmod 755 sites/default @@ -152,6 +158,7 @@ $DRUSH --verbose --yes \ --db-url="mysql://${DB_USER}:${DB_PASS}@localhost/${DB_NAME}" \ --site-name="$SITE_NAME" \ --site-mail="$SITE_MAIL" \ + --sites-subdir="default" \ --account-name="$ACCOUNT_NAME" \ --account-pass="$ACCOUNT_PASS" \ --account-mail="$ACCOUNT_MAIL" \