]>
Commit | Line | Data |
---|---|---|
1f7aba2f JK |
1 | diff -dur -x '*~' jpackage-utils-1.6.6.orig/java-utils/java-functions jpackage-utils-1.6.6/java-utils/java-functions |
2 | --- jpackage-utils-1.6.6.orig/java-utils/java-functions 2005-09-17 08:58:21.000000000 +0200 | |
3 | +++ jpackage-utils-1.6.6/java-utils/java-functions 2006-05-19 15:20:00.000000000 +0200 | |
4 | @@ -146,7 +146,7 @@ | |
5 | # Yuck, "grep -o" would be cleaner, but requires GNU grep >= 2.5. | |
6 | # This could be improved/simplified if sed had non-greedy matching. | |
7 | JAVA_VERSION=$($JAVACMD $opt 2>&1 | sed -n \ | |
8 | - -e '/java \(full \)*version "/s/'$re'/<<<\1>>>/' \ | |
9 | + -e '/java \(full \)*version "/s/'"$re"'/<<<\1>>>/' \ | |
10 | -e '/java \(full \)*version "/s/.*<<<\([^>]\{1,\}\)>>>.*/\1/p') | |
11 | if [ -n "$JAVA_VERSION" ] ; then | |
12 | break |