OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Aug-2007 11:47:48
Branch: HEAD Handle: 2007082710474600
Modified files:
openpkg-src/java java-toolkit.sh java.spec
Log:
bugfixes
Summary:
Revision Changes Path
1.2 +3 -2 openpkg-src/java/java-toolkit.sh
1.2 +2 -2 openpkg-src/java/java.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/java/java-toolkit.sh
============================================================================
$ cvs diff -u -r1.1 -r1.2 java-toolkit.sh
--- openpkg-src/java/java-toolkit.sh 27 Aug 2007 08:29:50 -0000 1.1
+++ openpkg-src/java/java-toolkit.sh 27 Aug 2007 09:47:46 -0000 1.2
@@ -30,12 +30,13 @@
else
JAVA_PLATFORM="unknown-unknown"
fi
- version=`($JAVA_HOME/bin/java -version; echo "") 2>/dev/null | sed
-e '1q' | \
+ version=`($JAVA_HOME/bin/java -version 2>&1; echo "") 2>/dev/null | \
+ grep "^java version" | sed -e '1q' | \
sed -e 's;^;X;' -e 's;^X.*"\([0-9][0-9.]*\)".*$;\1;' -e
's;^X.*;0.0.0;'`
JAVA_PLATFORM="$JAVA_PLATFORM-$version"
elif [ ".$JAVA_PLATFORM" != . ] && [ ".$JAVA_HOME" = . ]; then
# use installed platform
- entry=`grep "^[-+] $JAVA_PLATFORM" @l_prefix@/etc/java/toolkits`
+ entry=`grep "^[-+] $JAVA_PLATFORM" @l_prefix@/etc/java/toolkits |
sed -e '1q'`
if [ ".$entry" != . ]; then
JAVA_PLATFORM=`echo ".$entry" | awk '{ print $2; }'`
JAVA_HOME=`echo ".$entry" | awk '{ print $3; }'`
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/java/java.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 java.spec
--- openpkg-src/java/java.spec 27 Aug 2007 08:29:50 -0000 1.1
+++ openpkg-src/java/java.spec 27 Aug 2007 09:47:46 -0000 1.2
@@ -87,8 +87,8 @@
%preun
if [ $1 -eq 0 ]; then
if [ ".`$RPM_INSTALL_PREFIX/bin/java-toolkit --list`" != . ]; then
- echo "ERROR: there are still backend toolkit(s) registered." 1>&2
- echo "ERROR: please unregister them first with the commands:"
1>&2
+ echo "ERROR: There are still backend toolkit(s) registered." 1>&2
+ echo "ERROR: Please unregister them first with the commands:"
1>&2
echo "ERROR: \"$RPM_INSTALL_PREFIX/bin/java-toolkit --list\""
1>&2
echo "ERROR: \"$RPM_INSTALL_PREFIX/bin/java-toolkit
--unregister=<platform>\"" 1>&2
exit 1
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
