X-Git-Url: https://git.ao2.it/drupal-init-tools.git/blobdiff_plain/9892c3f6d1345adc99b1485cb29962852ddfe37f..71fe26eecf083217461e8f4f1bde959a10eb7466:/libexec/bootstrap.sh diff --git a/libexec/bootstrap.sh b/libexec/bootstrap.sh index 2381d29..a88bcdb 100755 --- a/libexec/bootstrap.sh +++ b/libexec/bootstrap.sh @@ -75,7 +75,7 @@ declare -p WEB_SERVER_GROUP if [ "x$MYSQL_ROOT_PASSWORD" = "x" ]; then - read -s -p "MySQL root password: " MYSQL_ROOT_PASSWORD + read -r -s -p "MySQL root password: " MYSQL_ROOT_PASSWORD echo fi @@ -95,9 +95,9 @@ DRUPAL_CONSOLE="${PWD}/vendor/bin/drupal" # This becomes unnecessary if the installation profile gets pulled in by # composer.json, like suggested in # https://github.com/drupal-composer/drupal-project/issues/249 -if ! echo "$INSTALLATION_PROFILE" | egrep -q "^(minimal|standard)$"; +if ! echo "$INSTALLATION_PROFILE" | grep -q -E "^(minimal|standard)$"; then - if [ -d "${SITE_LOCAL_PATH}/profiles/${INSTALLATION_PROFILE}" -a "$OVERWRITE_PROFILE" != "true" ]; + if [ -d "${SITE_LOCAL_PATH}/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