]> www.infradead.org Git - users/dwmw2/openconnect.git/commitdiff
Don't use bash for symbols test
authorDavid Woodhouse <dwmw2@infradead.org>
Mon, 22 May 2023 17:26:37 +0000 (10:26 -0700)
committerDavid Woodhouse <dwmw2@infradead.org>
Mon, 22 May 2023 17:27:06 +0000 (10:27 -0700)
Might fix #614?
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
tests/symbols

index d434103b58289f5057bf1f39a5985f5b35f938a5..fe50cd670e327c049baeb728a90c9e2f413ab38e 100755 (executable)
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 # Symbol version checking OpenConnect
 #
@@ -30,11 +30,7 @@ SYMBOLSFILE="${SYMBOLESFILE:-${top_srcdir}/libopenconnect5.symbols}"
 
 TMPSYMBOLS=symbols.$$.tmp
 
-function cleanup {
-    rm -f ${TMPSYMBOLS}
-}
-
-trap cleanup EXIT
+trap "rm -f ${TMPSYMBOLS}" EXIT
 
 ( sed -Enf ${SEDFILE} ${OPENCONNECT_H} | \
       sed -Enf- ${MAPFILE} ) > $TMPSYMBOLS
@@ -64,7 +60,7 @@ APIMAJOR="$(sed -n 's/^#define OPENCONNECT_API_VERSION_MAJOR \(.*\)/\1/p' ${OPEN
 APIMINOR="$(sed -n 's/^#define OPENCONNECT_API_VERSION_MINOR \(.*\)/\1/p' ${OPENCONNECT_H})"
 
 LASTVER="$(sed -En "/^ \* API version [0-9]+.[0-9]+.*/{p;q;}" ${OPENCONNECT_H})"
-if ! grep -q "API version $APIMAJOR.$APIMINOR" <<< "$LASTVER"; then
+if ! echo "$LASTVER" | grep -q "API version $APIMAJOR.$APIMINOR";  then
    echo "API $APIMAJOR.$APIMINOR is not the latest?"
    exit 1
 fi