From 4a198901f9f94ea9b0bad3ff39e8b083aac25b8a Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 18 Dec 2017 16:18:06 +0100 Subject: [PATCH 1/1] bootstrap.sh: rename SITE_LOCAL_PATH to WEB_ROOT for consistency Use the same name for all subcommands. --- libexec/bootstrap.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libexec/bootstrap.sh b/libexec/bootstrap.sh index a88bcdb..6d26c2e 100755 --- a/libexec/bootstrap.sh +++ b/libexec/bootstrap.sh @@ -79,12 +79,12 @@ then echo fi -SITE_LOCAL_PATH="${PWD}/web" +WEB_ROOT="${PWD}/web" command -v composer &> /dev/null || { echo "Aborting, 'composer' not available." 1>&2; exit 1; } command -v git &> /dev/null || { echo "Aborting, 'git' not available." 1>&2; exit 1; } -[ -d "$SITE_LOCAL_PATH" ] || composer install +[ -d "$WEB_ROOT" ] || composer install DRUSH="${PWD}/vendor/bin/drush" DRUPAL_CONSOLE="${PWD}/vendor/bin/drupal" @@ -97,17 +97,17 @@ DRUPAL_CONSOLE="${PWD}/vendor/bin/drupal" # https://github.com/drupal-composer/drupal-project/issues/249 if ! echo "$INSTALLATION_PROFILE" | grep -q -E "^(minimal|standard)$"; then - if [ -d "${SITE_LOCAL_PATH}/profiles/${INSTALLATION_PROFILE}" ] && [ "$OVERWRITE_PROFILE" != "true" ]; + if [ -d "${WEB_ROOT}/profiles/${INSTALLATION_PROFILE}" ] && [ "$OVERWRITE_PROFILE" != "true" ]; then echo "Installation profile '$INSTALLATION_PROFILE' already there." 1>&2 echo "Use --overwrite-profile to copy over it." 1>&2 exit 1 else - cp -a "$INSTALLATION_PROFILE" "${SITE_LOCAL_PATH}/profiles" + cp -a "$INSTALLATION_PROFILE" "${WEB_ROOT}/profiles" fi fi -pushd "$SITE_LOCAL_PATH" +pushd "$WEB_ROOT" # Update the install_profile if it's already there if grep -q "^\\\$settings\['install_profile'\] =" sites/default/settings.php; -- 2.1.4