From: Antonio Ospite Date: Mon, 18 Dec 2017 15:04:33 +0000 (+0100) Subject: Use the shell logical operators, avoid the non-portable -o and -a in "test" X-Git-Tag: v0.1.0~4 X-Git-Url: https://git.ao2.it/drupal-init-tools.git/commitdiff_plain/ad4bc7faa0f7d378a6153645f69a29aa10d5f27e?ds=inline Use the shell logical operators, avoid the non-portable -o and -a in "test" --- diff --git a/libexec/bootstrap.sh b/libexec/bootstrap.sh index 63318a4..a88bcdb 100755 --- a/libexec/bootstrap.sh +++ b/libexec/bootstrap.sh @@ -97,7 +97,7 @@ DRUPAL_CONSOLE="${PWD}/vendor/bin/drupal" # https://github.com/drupal-composer/drupal-project/issues/249 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 diff --git a/libexec/create-profile.sh b/libexec/create-profile.sh index 4ccdc9b..fae4bcc 100755 --- a/libexec/create-profile.sh +++ b/libexec/create-profile.sh @@ -47,7 +47,7 @@ do done -[ "x$1" = "x" -o "x$2" = "x" ] && { usage 1>&2; exit 1; } +{ [ "x$1" = "x" ] || [ "x$2" = "x" ]; } && { usage 1>&2; exit 1; } PROFILE_TITLE="$1" PROFILE_MACHINE_NAME="$2"