X-Git-Url: https://git.ao2.it/drupal-init-tools.git/blobdiff_plain/8605b497103416629f9ca1bc6e76e6276db8f0e5..3451b71196a4beb632d7f9d37fdeee6ce4b4a811:/libexec/new.sh

diff --git a/libexec/new.sh b/libexec/new.sh
index 0259f4e..c083b59 100755
--- a/libexec/new.sh
+++ b/libexec/new.sh
@@ -60,15 +60,13 @@ command -v git &> /dev/null || { echo "Aborting, 'git' not available." 1>&2; exi
 echo "Creating a new Drupal project..."
 composer create-project drupal-composer/drupal-project:8.x-dev@dev "$DESTDIR" --keep-vcs --stability dev --no-interaction
 
-pushd "$DESTDIR"
+pushd "$DESTDIR" > /dev/null
 
 git remote rename origin upstream
 git checkout -b master
 
-# Add some patches, use sed until composer can do that from the command line
-# (e.g. composer config ...)
-sed -i -e 's@"extra": {@"extra": {\
-        "patches-file": "composer.patches.json",@' composer.json
+# Add some patches
+composer config extra.patches-file "composer.patches.json"
 
 cat > composer.patches.json <<EOF
 {
@@ -108,10 +106,21 @@ cat > bootstrap.conf <<EOF
 #  "ip6-localhost"
 #  )
 
-#MYSQL_ROOT_PASSWORD="password"
+# See the 'drin' man page for details about database access.
+
+# Set MYSQL_PASSWORDLESS_ACCESS to 'true' if the database is configured to
+# allow administrative password-less access to the user who will execute the
+# 'drin boostrap' command.
+#MYSQL_PASSWORDLESS_ACCESS=true
+
+# If, instead,  administrative access requires a password, uncomment and
+# change the values of the following variables.
+#MYSQL_SU_USER='root'
+#MYSQL_SU_PASSWORD='password'
 EOF
 
-cat > .gitignore <<EOF
+cat >> .gitignore <<EOF
+
 # Ignore the configuration for the bootstrap script
 bootstrap.conf
 EOF
@@ -131,4 +140,4 @@ echo
 echo "Double check the provided .htaccess file to make sure that access to"
 echo "'$PWD' is restricted by the web server."
 
-popd
+popd > /dev/null