Index: src/javavmwrapper.sh
===================================================================
--- src/javavmwrapper.sh	(revision 350779)
+++ src/javavmwrapper.sh	(working copy)
@@ -193,7 +193,7 @@
                         JAVAVM=
                         continue
                         ;;
-                    diablo-jdk*)
+                    linux-*-jdk*)
                         case "${_VM}" in
                             open*)
                                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
@@ -206,9 +206,9 @@
                                 ;;
                         esac
                         ;;
-                    diablo-jre*|jdk*)
+                    linux-*-jre*)
                         case "${_VM}" in
-                            open*|diablo*)
+                            open*|linux-*)
                                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
                                 continue
                                 ;;
@@ -219,32 +219,6 @@
                                 ;;
                         esac
                         ;;
-                    jre*|linux-sun-jdk*)
-                        case "${_VM}" in
-                            open*|diablo*|j*)
-                                _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
-                                continue
-                                ;;
-                            *)
-                                _JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}"
-                                JAVAVM=
-                                continue
-                                ;;
-                        esac
-                        ;;
-                    linux-sun-jre*)
-                        case "${_VM}" in
-                            open*|diablo*|j*|linux-sun*)
-                                _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
-                                continue
-                                ;;
-                            *)
-                                _JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}"
-                                JAVAVM=
-                                continue
-                                ;;
-                        esac
-                        ;;
                 esac
                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
             fi
@@ -530,14 +504,17 @@
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6"
                     ;;
                 1.5+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8"
                     ;;
                 1.6+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8"
                     ;;
                 1.7+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8"
                     ;;
+                1.8+)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8"
+                    ;;
                 *)
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"
                     ;;
@@ -570,7 +547,7 @@
         if [ -n "${JAVA_OS}" ]; then
             _JAVAVM_OS=
             case "${_JAVAVM_VM}" in
-                diablo*|j*|openjdk*)
+                openjdk*)
                     _JAVAVM_OS=native
                     ;;
                 linux*)
@@ -594,9 +571,12 @@
                 openjdk*)
                     _JAVAVM_VENDOR=openjdk
                     ;;
-                linux*)
+                linux-sun*)
                     _JAVAVM_VENDOR=sun
                     ;;
+                linux-oracle*)
+                    _JAVAVM_VENDOR=oracle
+                    ;;
             esac
             for _JAVAVM_REQUESTED_VENDOR in ${JAVA_VENDOR}; do
                 if [ "${_JAVAVM_VENDOR}" = "${_JAVAVM_REQUESTED_VENDOR}" ]; then