devonfw#893: extended test and fixed doVersionCompare

hohwille · Oct 18, 2022 · 8be2073 · 8be2073
1 parent 2ea3894
commit 8be2073
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/scripts/src/main/resources/scripts/functions b/scripts/src/main/resources/scripts/functions
@@ -1500,8 +1500,8 @@ function doVersionCompare() {
           n2="${r2//[^0-9]/}"
           local x1="${r1:0:(${#r1}-${#n1})}"
           local x2="${r2:0:(${#r2}-${#n2})}"
-          x1="${x1//[-_+]/}"
-          x2="${x2//[-_+]/}"
+          x1="${x1//[-_+*]/}"
+          x2="${x2//[-_+*]/}"
           if [ "${x1}" = "${x2}" ]
           then
             if [ -z "${n1}" ]

diff --git a/scripts/src/test/bash/test-version-compare b/scripts/src/test/bash/test-version-compare
@@ -58,5 +58,6 @@ doTestVersionCompare 3.0.0.rc2 '<' 3.0.0
 doTestVersionCompare 3.0.0-beta17 '>' 3.0.0-beta11-SNAPSHOT
 doTestVersionCompare 3.0.0.11 '>' 3.0.0-beta11-SNAPSHOT
 doTestVersionCompare 2020.04.001 '>' 3.3.1
+doTestVersionCompare "11*" '>' "11u0"
 
 exit "${exitcode}"