From: Tobias Brunner Date: Wed, 12 Feb 2020 16:49:14 +0000 (+0100) Subject: cirrus: Remove bashisms from test script to make it compatible with /bin/sh X-Git-Tag: 5.8.3dr1~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdce492ed04548db180b8e8d7f1b48a5212bceba;p=thirdparty%2Fstrongswan.git cirrus: Remove bashisms from test script to make it compatible with /bin/sh Bash is not installed on the FreeBSD images here and the location would be different anyway (`/usr/local/bin/bash`, so we'd have to change the hashbang to e.g. `/usr/bin/env bash`). --- diff --git a/.cirrus.yml b/.cirrus.yml index ad7737e853..674d065404 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,5 +1,5 @@ freebsd_instance: - image: freebsd-12-0-release-amd64 + image: freebsd-12-1-release-amd64 env: TESTS_REDUCED_KEYLENGTHS: yes diff --git a/scripts/test.sh b/scripts/test.sh index 3531fdb745..936e1da850 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Build script for Travis CI build_botan() @@ -306,7 +306,7 @@ lgtm) -H 'Accept: application/json' \ -H "Authorization: Bearer ${LGTM_TOKEN}" > lgtm.res || exit $? lgtm_check_url=$(jq -r '."task-result-url"' lgtm.res) - if [ "$lgtm_check_url" == "null" ]; then + if [ "$lgtm_check_url" = "null" ]; then cat lgtm.res | jq exit 1 fi @@ -337,7 +337,7 @@ lgtm) lgtm_new=$(jq -r '.languages[].new' lgtm.res | awk '{t+=$1} END {print t}') lgtm_fixed=$(jq -r '.languages[].fixed' lgtm.res | awk '{t+=$1} END {print t}') echo -n "Code review complete: " - echo -e "\e[1;31m${lgtm_new}\e[0m new alerts, \e[1;32m${lgtm_fixed}\e[0m fixed" + printf "%b\n" "\e[1;31m${lgtm_new}\e[0m new alerts, \e[1;32m${lgtm_fixed}\e[0m fixed" exit $lgtm_new fi ;;