From 239f38729d5b4d1c4638e4195bd86fb92e70e4ec Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Wed, 11 Aug 2021 11:43:38 +0200 Subject: [PATCH] Fix shell coding style --- scripts/test-installcomposer | 24 ++++++++++++------------ scripts/test-installversion | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/test-installcomposer b/scripts/test-installcomposer index 0ba2757..0ef1b84 100755 --- a/scripts/test-installcomposer +++ b/scripts/test-installcomposer @@ -7,24 +7,24 @@ set -o nounset WANTED_VERSION="${1:-}" INSTALLME=@composer if test -n "$WANTED_VERSION"; then - INSTALLME="$INSTALLME-$1" + INSTALLME="$INSTALLME-$1" fi CI=true ./install-php-extensions "$INSTALLME" INSTALLED_VERSION="$(composer --version | sed -E 's/^.*[Vv]ersion\s*(\S+).*$/\1/')" if test -z "$WANTED_VERSION"; then - echo 'Installing the latest version worked' + echo 'Installing the latest version worked' elif printf '%s' "$WANTED_VERSION" | grep -Eq '^[0-9]+$'; then - if test "${INSTALLED_VERSION#$WANTED_VERSION.}" = "$INSTALLED_VERSION"; then - printf 'Installing major version %s DID NOT worked (we installed version %s)\n' "$WANTED_VERSION" "$INSTALLED_VERSION" - exit 1 - fi - printf 'Installing major version %s worked (we installed version %s)\n' "$WANTED_VERSION" "$INSTALLED_VERSION" + if test "${INSTALLED_VERSION#$WANTED_VERSION.}" = "$INSTALLED_VERSION"; then + printf 'Installing major version %s DID NOT worked (we installed version %s)\n' "$WANTED_VERSION" "$INSTALLED_VERSION" + exit 1 + fi + printf 'Installing major version %s worked (we installed version %s)\n' "$WANTED_VERSION" "$INSTALLED_VERSION" else - if test "$INSTALLED_VERSION" != "$WANTED_VERSION"; then - printf 'Installing specific version %s DID NOT worked (we installed version %s)\n' "$WANTED_VERSION" "$INSTALLED_VERSION" - exit 1 - fi - printf 'Installing specific version %s worked\n' "$INSTALLED_VERSION" + if test "$INSTALLED_VERSION" != "$WANTED_VERSION"; then + printf 'Installing specific version %s DID NOT worked (we installed version %s)\n' "$WANTED_VERSION" "$INSTALLED_VERSION" + exit 1 + fi + printf 'Installing specific version %s worked\n' "$INSTALLED_VERSION" fi diff --git a/scripts/test-installversion b/scripts/test-installversion index b9d7799..3114d99 100755 --- a/scripts/test-installversion +++ b/scripts/test-installversion @@ -8,19 +8,19 @@ WANTED_VERSION="${1:-}" WANTED_VERSION_AFTERCARET="${1#^}" INSTALLME=xdebug if test -n "$WANTED_VERSION"; then - INSTALLME="$INSTALLME-$1" + INSTALLME="$INSTALLME-$1" fi CI=true ./install-php-extensions "$INSTALLME" INSTALLED_VERSION="$(php --ri xdebug | grep -Ei 'Version\s*=>\s*' | sed -E 's/^.*?=>\s*//')" if test -z "$WANTED_VERSION"; then - printf 'Installing the default version worked (we installed version %s)\n' "$INSTALLED_VERSION" + printf 'Installing the default version worked (we installed version %s)\n' "$INSTALLED_VERSION" elif test "$WANTED_VERSION" = "$INSTALLED_VERSION"; then - printf 'Installing specific version %s worked\n' "$WANTED_VERSION" + printf 'Installing specific version %s worked\n' "$WANTED_VERSION" elif test "$WANTED_VERSION" != "$WANTED_VERSION_AFTERCARET" && test "${INSTALLED_VERSION#$WANTED_VERSION_AFTERCARET.}" != "$INSTALLED_VERSION"; then - printf 'Installing version compatible with %s worked (we installed version %s)\n' "$WANTED_VERSION" "$INSTALLED_VERSION" + printf 'Installing version compatible with %s worked (we installed version %s)\n' "$WANTED_VERSION" "$INSTALLED_VERSION" else - printf 'We wanted to install version %s, but we installed %s\n' "$WANTED_VERSION" "$INSTALLED_VERSION" >&2 - exit 1 + printf 'We wanted to install version %s, but we installed %s\n' "$WANTED_VERSION" "$INSTALLED_VERSION" >&2 + exit 1 fi