From 2635b0bec69e725234f797626b194d3519ff6b67 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Tue, 11 Dec 2018 14:21:07 +0100
Subject: [PATCH] One-liner shell instructions

---
 scripts/travisci-test-new-extensions | 51 ++++++++++------------------
 1 file changed, 17 insertions(+), 34 deletions(-)

diff --git a/scripts/travisci-test-new-extensions b/scripts/travisci-test-new-extensions
index f7dab1d..447a780 100755
--- a/scripts/travisci-test-new-extensions
+++ b/scripts/travisci-test-new-extensions
@@ -5,14 +5,12 @@ set -o errexit
 set -o nounset
 
 echo 'Checking environment'
-if test -z "${TRAVIS_BUILD_DIR:-}"
-then
+if test -z "${TRAVIS_BUILD_DIR:-}"; then
 	echo 'Not in a TravisCI environment' >&2
 	exit 1
 fi
 
-if test -z "${TRAVIS_COMMIT_RANGE:-}"
-then
+if test -z "${TRAVIS_COMMIT_RANGE:-}"; then
 	echo 'The TravisCI commit range is empty' >&2
 	exit 0
 fi
@@ -31,10 +29,8 @@ fi
 getExtensionImage () {
 	getExtensionImage_result="php:${2}-cli"
 	getExtensionImage_reqs="${TRAVIS_BUILD_DIR}/data/special-requirements"
-	if test -f "${getExtensionImage_reqs}"
-	then
-		if test -n "$(cat "${getExtensionImage_reqs}" | grep -E "^${1}[ \t]+zts[ \t]*$")"
-		then
+	if test -f "${getExtensionImage_reqs}"; then
+		if test -n "$(cat "${getExtensionImage_reqs}" | grep -E "^${1}[ \t]+zts[ \t]*$")"; then
 			getExtensionImage_result="php:${2}-zts"
 		fi
 	fi
@@ -53,8 +49,7 @@ getExtensionImage () {
 # 1 (false): if test fails
 testExtension () {
 	printf 'PHP version: %s\n' "${2}"
-	if test -n "$(printf '%s' "${2}" | sed -E 's/^[0-9]+\.[0-9]+$//')"
-	then
+	if test -n "$(printf '%s' "${2}" | sed -E 's/^[0-9]+\.[0-9]+$//')"; then
 		printf '  INVALID PHP VERSION: %s\n' "${2}" >&2
 		return 0
 	fi
@@ -74,24 +69,20 @@ testExtension () {
 # 1 (false): if test fails
 testNewExtensionLine () {
 	testNewExtensionLine_rc=0
-	if test $# -lt 2
-	then
+	if test $# -lt 2; then
 		printf 'Missing PHP version list for the new extension %s\n' "${1:-}"
 		testNewExtensionLine_rc=1
 	else
 		printf '### TESTING NEW EXTENSION %s ###\n' "${1}"
-		if test -n "$(printf '%s' "${1}" | sed -E 's/^[a-z][a-z0-9\-\_\.]+$//')"
-		then
+		if test -n "$(printf '%s' "${1}" | sed -E 's/^[a-z][a-z0-9\-\_\.]+$//')"; then
 			printf '   INVALID PHP EXTENSION NAME: %s\n' "${1}" >&2
 			testNewExtensionLine_rc=1
 		else
 			testNewExtensionLine_extension="${1}"
-			while test $# -ge 2
-			do
+			while test $# -ge 2; do
 				shift
 				testNewExtensionLine_phpVersion="${1}"
-				if ! testExtension "${testNewExtensionLine_extension}" "${1}"
-				then
+				if ! testExtension "${testNewExtensionLine_extension}" "${1}"; then
 					testNewExtensionLine_rc=1
 				fi
 			done
@@ -105,34 +96,26 @@ ADDED_EXTENSION_LINE=
 FOUND_ATAT=
 IFS='
 '
-for DIFF_LINE in $(git -C "${TRAVIS_BUILD_DIR}" diff --no-indent-heuristic --minimal --no-color --word-diff=none -no-renames --unified=0 "${TRAVIS_COMMIT_RANGE:-}" -- data/supported-extensions)
-do
-	if test -n "${DIFF_LINE}"
-	then
-		if test -z "${FOUND_ATAT}"
-		then
-			if test -z "${DIFF_LINE##@@*}"
-			then
+for DIFF_LINE in $(git -C "${TRAVIS_BUILD_DIR}" diff --no-indent-heuristic --minimal --no-color --word-diff=none -no-renames --unified=0 "${TRAVIS_COMMIT_RANGE:-}" -- data/supported-extensions); do
+	if test -n "${DIFF_LINE}"; then
+		if test -z "${FOUND_ATAT}"; then
+			if test -z "${DIFF_LINE##@@*}"; then
 				FOUND_ATAT=y
 			fi
-		elif test -z "${DIFF_LINE##+*}"
-		then
+		elif test -z "${DIFF_LINE##+*}"; then
 			resetIFS
 			ADDED_EXTENSION_LINE="${DIFF_LINE##+}"
-			if ! testNewExtensionLine ${ADDED_EXTENSION_LINE}
-			then
+			if ! testNewExtensionLine ${ADDED_EXTENSION_LINE}; then
 				TESTS_RESULTS=1
 			fi
 		fi
 	fi
 done
 
-if test ${TESTS_RESULTS} -ne 0
-then
+if test ${TESTS_RESULTS} -ne 0; then
 	exit ${TESTS_RESULTS}
 fi
 
-if test -z "${ADDED_EXTENSION_LINE}"
-then
+if test -z "${ADDED_EXTENSION_LINE}"; then
 	echo 'No new extensions detected.'
 fi