From 20359fde713aa74a684fde5b65a675f9e97d7f8e Mon Sep 17 00:00:00 2001 From: Torben Brenner Date: Tue, 1 Aug 2023 10:23:14 +0200 Subject: [PATCH 1/2] fix: correctly parse curl output --- lib/prerequisites.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/prerequisites.sh b/lib/prerequisites.sh index 0cec06b..396b6e5 100755 --- a/lib/prerequisites.sh +++ b/lib/prerequisites.sh @@ -68,7 +68,7 @@ source /etc/bridgehead/${PROJECT}.conf source ${PROJECT}/vars set +e -SERVERTIME="$(https_proxy=$HTTPS_PROXY_URL curl -m 5 -s -I $BROKER_URL 2>&1)" +SERVERTIME="$(https_proxy=$HTTPS_PROXY_URL curl -m 5 -s -I $BROKER_URL 2>&1 | grep -e '^Date: ' | sed -e 's/^Date: //')" RET=$? set -e if [ $RET -ne 0 ]; then @@ -77,7 +77,6 @@ if [ $RET -ne 0 ]; then else log INFO "Checking clock skew ..." - SERVERTIME=$(echo -e "$SERVERTIME" | grep Date | sed -e 's/< Date: //') SERVERTIME_AS_TIMESTAMP=$(date --date="$SERVERTIME" +%s) MYTIME=$(date +%s) SKEW=$(($SERVERTIME_AS_TIMESTAMP - $MYTIME)) From 7093166a53e1ea308e1af9d014de4be5c9bb7377 Mon Sep 17 00:00:00 2001 From: Torben Brenner Date: Tue, 1 Aug 2023 10:25:23 +0200 Subject: [PATCH 2/2] fix: make the check case insensitive --- lib/prerequisites.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/prerequisites.sh b/lib/prerequisites.sh index 396b6e5..810be31 100755 --- a/lib/prerequisites.sh +++ b/lib/prerequisites.sh @@ -68,7 +68,7 @@ source /etc/bridgehead/${PROJECT}.conf source ${PROJECT}/vars set +e -SERVERTIME="$(https_proxy=$HTTPS_PROXY_URL curl -m 5 -s -I $BROKER_URL 2>&1 | grep -e '^Date: ' | sed -e 's/^Date: //')" +SERVERTIME="$(https_proxy=$HTTPS_PROXY_URL curl -m 5 -s -I $BROKER_URL 2>&1 | grep -i -e '^Date: ' | sed -e 's/^Date: //i')" RET=$? set -e if [ $RET -ne 0 ]; then