bootstrap.sh: always update RewriteBase

[drupal-init-tools.git] / libexec / bootstrap.sh

diff --git a/libexec/bootstrap.sh b/libexec/bootstrap.sh
index 6d26c2e..edf8314 100755 (executable)
--- a/libexec/bootstrap.sh
+++ b/libexec/bootstrap.sh
@@ -20,7 +20,7 @@ set -e
 
 usage() {
   cat <<EOF
 
 usage() {
   cat <<EOF

-usage: drin $(basename "$0" .sh) [--devel|-h|--help]
+usage: drin $(basename "$0" .sh) [--devel|--overwrite-profile|-h|--help]

 
 Bootstrap a Drupal project, using settings from a 'bootstrap.conf' file.
 
 
 Bootstrap a Drupal project, using settings from a 'bootstrap.conf' file.
 


@@ -52,6 +52,8 @@ do
   shift
 done
 
   shift
 done
 

+[ -f "bootstrap.conf" ] || { echo "Aborting, run this command from the Drupal project directory." 1>&2; exit 1; }
+

 # shellcheck disable=SC1091
 . bootstrap.conf
 
 # shellcheck disable=SC1091
 . bootstrap.conf
 


@@ -148,7 +150,7 @@ sudo chgrp -R "$WEB_SERVER_GROUP" sites/default/files
 [ -d ../config/sync ] && sudo chgrp -R "$WEB_SERVER_GROUP" ../config/sync
 
 # Enables clean URLs
 [ -d ../config/sync ] && sudo chgrp -R "$WEB_SERVER_GROUP" ../config/sync
 
 # Enables clean URLs

-sed -i "s@# RewriteBase /drupal\$@RewriteBase ${SITE_BASE_PATH}@" .htaccess
+sed -i "s@\(# \)\{0,1\}RewriteBase .*\$@RewriteBase ${SITE_BASE_PATH}@" .htaccess

 
 chmod 755 sites/default
 chmod 644 sites/default/settings.php
 
 chmod 755 sites/default
 chmod 644 sites/default/settings.php