X-Git-Url: https://git.ao2.it/drupal-init-tools.git/blobdiff_plain/cd466881de54893a6f3997f9485c6725570adc76..e7bc3fbe35e1c90cb8dbaf31e3875f99d448f654:/libexec/bootstrap.sh

diff --git a/libexec/bootstrap.sh b/libexec/bootstrap.sh
index e3671c0..9975299 100755
--- a/libexec/bootstrap.sh
+++ b/libexec/bootstrap.sh
@@ -26,7 +26,8 @@ Bootstrap a Drupal project, using settings from a 'bootstrap.conf' file.
 
 Options:
   --devel              install drupal/devel and use a settings.local.php file
-  --overwrite-profile  allow overwriting the current installation profile
+  --overwrite-profile  allow overwriting the installation profile of the site
+                       with a profile copied from the current working directory
   -h, --help           display this usage message and exit
 
 EOF
@@ -118,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
@@ -129,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
@@ -156,7 +163,7 @@ $DRUSH --verbose --yes \
   --account-mail="$ACCOUNT_MAIL" \
   "$INSTALLATION_PROFILE"
 
-if $DRUSH pm-info --fields=status locale | grep -q enabled;
+if $DRUSH pm-list --type=module --field=name --status=enabled --pipe | grep -q "^locale$";
 then
   # This is necessary for multi-language sites, it fixes some issues like:
   #   "The Translation source field needs to be installed."