From 1d15946cff9ae5bb9a3a3210730e1f15382e5ca1 Mon Sep 17 00:00:00 2001
From: s1lentq <s1lentsk@yandex.ru>
Date: Tue, 13 Apr 2021 04:35:26 +0700
Subject: [PATCH] build.sh fix jobs option parsing glibc_test.sh: reworked
 pattern

---
 .github/workflows/build.yml  | 2 +-
 build.sh                     | 8 ++++----
 rehlds/version/glibc_test.sh | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8d9693b..8c84908 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -192,7 +192,7 @@ jobs:
             echo -e "\e[30;43mExit code: $retVal\e[0m"
           fi
         shell: bash
-          
+
       - name: Build using Intel C++ Compiler
         run: |
           rm -rf build && CC=icc CXX=icpc cmake -B build && cmake --build build -j8
diff --git a/build.sh b/build.sh
index b891edd..5b06df8 100755
--- a/build.sh
+++ b/build.sh
@@ -9,7 +9,7 @@ for i in "$@"
 do
 case $i in
 	-j=*|--jobs=*)
-		jobs="${i#*=}"
+		jobs="-j${i#*=}"
 		shift
 	;;
 	-c=*|--compiler=*)
@@ -33,7 +33,7 @@ esac
 
 rm -rf build
 mkdir build
-pushd build
+pushd build &> /dev/null
 CC=$CC CXX=$CXX cmake ${args[@]} ..
-make -j${jobs}
-popd
+make ${jobs}
+popd > /dev/null
diff --git a/rehlds/version/glibc_test.sh b/rehlds/version/glibc_test.sh
index 8463a90..74d41d2 100755
--- a/rehlds/version/glibc_test.sh
+++ b/rehlds/version/glibc_test.sh
@@ -22,7 +22,7 @@ main()
 			elif [ "$version" = "PRIVATE" ]; then
 				version="PRV"
 			# ensure numeric
-			elif [[ $version =~ ^[0-9]+$ ]]; then
+			elif [[ $version =~ ^([0-9]+\.){0,2}(\*|[0-9]+)$ ]]; then
 				check_version_greater $version ${threshold_version[$k]}
 				if [[ $? -eq 1 ]]; then
 					echo -e "\033[0;31mAssertion failed:\033[0m Binary \033[0;32m${f}\033[0m has ${k}_\033[0;33m$version\033[0m greater than max version ${k}_\033[0;33m${threshold_version[$k]}\033[0m"