SOURCES: jpackage-utils-pdksh.patch (NEW) - fix for java-functions...
jajcus
jajcus at pld-linux.org
Fri May 19 15:41:18 CEST 2006
Author: jajcus Date: Fri May 19 13:41:18 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fix for java-functions to work with pdksh (was bashism or pdksh bug)
---- Files affected:
SOURCES:
jpackage-utils-pdksh.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/jpackage-utils-pdksh.patch
diff -u /dev/null SOURCES/jpackage-utils-pdksh.patch:1.1
--- /dev/null Fri May 19 15:41:18 2006
+++ SOURCES/jpackage-utils-pdksh.patch Fri May 19 15:41:13 2006
@@ -0,0 +1,12 @@
+diff -dur -x '*~' jpackage-utils-1.6.6.orig/java-utils/java-functions jpackage-utils-1.6.6/java-utils/java-functions
+--- jpackage-utils-1.6.6.orig/java-utils/java-functions 2005-09-17 08:58:21.000000000 +0200
++++ jpackage-utils-1.6.6/java-utils/java-functions 2006-05-19 15:20:00.000000000 +0200
+@@ -146,7 +146,7 @@
+ # Yuck, "grep -o" would be cleaner, but requires GNU grep >= 2.5.
+ # This could be improved/simplified if sed had non-greedy matching.
+ JAVA_VERSION=$($JAVACMD $opt 2>&1 | sed -n \
+- -e '/java \(full \)*version "/s/'$re'/<<<\1>>>/' \
++ -e '/java \(full \)*version "/s/'"$re"'/<<<\1>>>/' \
+ -e '/java \(full \)*version "/s/.*<<<\([^>]\{1,\}\)>>>.*/\1/p')
+ if [ -n "$JAVA_VERSION" ] ; then
+ break
================================================================
More information about the pld-cvs-commit
mailing list