projects
/
drupal-init-tools.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bootstrap.sh: improve the informational message about 'git core-diff'
[drupal-init-tools.git]
/
libexec
/
bootstrap.sh
diff --git
a/libexec/bootstrap.sh
b/libexec/bootstrap.sh
index
422fafe
..
8b92f97
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.
@@
-149,8
+149,8
@@
sudo chgrp -R "$WEB_SERVER_GROUP" sites/default/files
[ -d ../config/sync ] && sudo chgrp -R "$WEB_SERVER_GROUP" ../config/sync
[ -d ../config/sync ] && sudo chgrp -R "$WEB_SERVER_GROUP" ../config/sync
-# Enable
s
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
chmod 755 sites/default
chmod 644 sites/default/settings.php
@@
-199,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/"
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
echo "This command helps creating core patches ready for upstream."
fi