From 3fc08d09752f18e6a974f83172693c342b9d9786 Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Tue, 15 Sep 2020 08:49:33 +0200
Subject: [PATCH] check_cxx_abi.sh: fixes

* wrong condition causing whe whole cycle skipping
* sort - use version compare (numeric was not correct
* missing -a
---
 .github/scripts/Linux/check_cxx_abi.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/scripts/Linux/check_cxx_abi.sh b/.github/scripts/Linux/check_cxx_abi.sh
index e9315284b..ee0ef044a 100755
--- a/.github/scripts/Linux/check_cxx_abi.sh
+++ b/.github/scripts/Linux/check_cxx_abi.sh
@@ -19,13 +19,13 @@ while test $# -gt 0; do
                 shift
                 continue
         fi
-        GLIBCXX_CUR=$(nm $1 | sed -n 's/.*GLIBCXX_\([0-9.]*\).*/\1/p' | sort -n | tail -n 1)
-        CXX_CUR=$(nm $1 | sed -n 's/.*CXXABI_\([0-9.]*\).*/\1/p' | sort -n | tail -n 1)
+        GLIBCXX_CUR=$(nm $1 | sed -n 's/.*GLIBCXX_\([0-9.]*\).*/\1/p' | sort -V | tail -n 1)
+        CXX_CUR=$(nm $1 | sed -n 's/.*CXXABI_\([0-9.]*\).*/\1/p' | sort -V | tail -n 1)
         if [ -n "$GLIBCXX_CUR" -a "$($SEMVER_CMP $GLIBCXX_CUR $GLIBCXX_MAX)" -gt 0 ]; then
                 echo "$1: GLIBCXX $GLIBCXX_CUR ($GLIBCXX_MAX required)" 1>&2
                 exit 1
         fi
-        if [ -n "$CXX_CUR" "$($SEMVER_CMP $CXX_CUR $CXX_MAX)" -gt 0 ]; then
+        if [ -n "$CXX_CUR" -a "$($SEMVER_CMP $CXX_CUR $CXX_MAX)" -gt 0 ]; then
                 echo "$1: CXX $CXX_CUR ($CXX_MAX required)" 1>&2
                 exit 1
         fi