summarylogtreecommitdiffstats
path: root/ffdec-script-regex-fix.patch
blob: 6e2d69e4edbe1a7c5a95865d921731bff3d18b35 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
diff --unified --recursive jpexs-decompiler-version26.2.1.old/resources/ffdec.sh jpexs-decompiler-version26.2.1.new/resources/ffdec.sh
--- jpexs-decompiler-version26.2.1.old/resources/ffdec.sh	2026-08-23 12:14:01.935619491 +0000
+++ jpexs-decompiler-version26.2.1.new/resources/ffdec.sh	2026-08-23 12:19:20.642498189 +0000
@@ -41,10 +41,10 @@
 }
 
 check_java_version () {
-    JVER1=$(echo $JAVA_VERSION_OUTPUT | sed -E 's/java version "([0-9]*)\.[0-9]*\.[0-9]*(_[0-9]*)?".*/\1/')
-    JVER2=$(echo $JAVA_VERSION_OUTPUT | sed -E 's/java version "[0-9]*\.([0-9]*)\.[0-9]*(_[0-9]*)?".*/\1/')
-    JVER3=$(echo $JAVA_VERSION_OUTPUT | sed -E 's/java version "[0-9]*\.[0-9]*\.([0-9]*)(_[0-9]*)?".*/\1/')
-    JVER4=$(echo $JAVA_VERSION_OUTPUT | sed -E 's/java version "[0-9]*\.[0-9]*\.[0-9]*(_([0-9]*))?".*/\2/' | sed 's/^$/0/')
+    JVER1=$(echo $JAVA_VERSION_OUTPUT | sed -E 's/java version "([0-9]*)\.[0-9]*\.[0-9]*([_.][0-9]*)?".*/\1/')
+    JVER2=$(echo $JAVA_VERSION_OUTPUT | sed -E 's/java version "[0-9]*\.([0-9]*)\.[0-9]*([_.][0-9]*)?".*/\1/')
+    JVER3=$(echo $JAVA_VERSION_OUTPUT | sed -E 's/java version "[0-9]*\.[0-9]*\.([0-9]*)([_.][0-9]*)?".*/\1/')
+    JVER4=$(echo $JAVA_VERSION_OUTPUT | sed -E 's/java version "[0-9]*\.[0-9]*\.[0-9]*([_.]([0-9]*))?".*/\2/' | sed 's/^$/0/')
 
     if [ "$JVER1" -gt $REQ_JVER1 ]; then
         return 0