bootstrap.sh: rename SITE_LOCAL_PATH to WEB_ROOT for consistency
authorAntonio Ospite <ao2@ao2.it>
Mon, 18 Dec 2017 15:18:06 +0000 (16:18 +0100)
committerAntonio Ospite <ao2@ao2.it>
Mon, 18 Dec 2017 15:18:06 +0000 (16:18 +0100)
Use the same name for all subcommands.

libexec/bootstrap.sh

index a88bcdb..6d26c2e 100755 (executable)
@@ -79,12 +79,12 @@ then
   echo
 fi
 
   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; }
 
 
 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"
 
 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
 # 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
   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
 
   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;
 
 # Update the install_profile if it's already there
 if grep -q "^\\\$settings\['install_profile'\] =" sites/default/settings.php;