X-Git-Url: https://git.ao2.it/drupal-init-tools.git/blobdiff_plain/4a198901f9f94ea9b0bad3ff39e8b083aac25b8a..646a49a82d2501c9bc539facb099e914202e930f:/libexec/bootstrap.sh

diff --git a/libexec/bootstrap.sh b/libexec/bootstrap.sh
index 6d26c2e..8b92f97 100755
--- a/libexec/bootstrap.sh
+++ b/libexec/bootstrap.sh
@@ -20,7 +20,7 @@ set -e
 
 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.
 
@@ -52,6 +52,8 @@ do
   shift
 done
 
+[ -f "bootstrap.conf" ] || { echo "Aborting, run this command from the Drupal project directory." 1>&2; exit 1; }
+
 # shellcheck disable=SC1091
 . bootstrap.conf
 
@@ -147,8 +149,8 @@ sudo chgrp -R "$WEB_SERVER_GROUP" sites/default/files
 
 [ -d ../config/sync ] && sudo chgrp -R "$WEB_SERVER_GROUP" ../config/sync
 
-# Enables clean URLs
-sed -i "s@# RewriteBase /drupal\$@RewriteBase ${SITE_BASE_PATH}@" .htaccess
+# Enable clean URLs
+sed -i "s@\(# \)\{0,1\}RewriteBase .*\$@RewriteBase ${SITE_BASE_PATH}@" .htaccess
 
 chmod 755 sites/default
 chmod 644 sites/default/settings.php
@@ -197,7 +199,7 @@ chmod 555 sites/default
 if [ -d core/.git ];
 then
   git -C core/ config --local alias.core-diff "diff --src-prefix=a/core/ --dst-prefix=b/core/"
-  echo "Added a 'git core-diff' to the drupal/core repository clone."
+  echo "Added a 'git core-diff' command to the drupal/core repository clone."
   echo "This command helps creating core patches ready for upstream."
 fi