From 32e8859df629e39958d095b1c932e26d1ed349b0 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Tue, 19 Sep 2017 13:33:07 +0200
Subject: [PATCH] Support Java 10

In bash, "10" < "1.6" returns false, because it's a string comparison.
Use bc instead to compare decimal numbers.
---
 src/universal/bin/sbt-launch-lib.bash | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/universal/bin/sbt-launch-lib.bash b/src/universal/bin/sbt-launch-lib.bash
index cd1f6b6ea..abe9fb742 100755
--- a/src/universal/bin/sbt-launch-lib.bash
+++ b/src/universal/bin/sbt-launch-lib.bash
@@ -189,13 +189,14 @@ syncPreloaded() {
 checkJava() {
   local required_version="$1"
   # Now check to see if it's a good enough version
+  local good_enough="$(echo "$java_version >= $required_version" | bc)"
   if [[ "$java_version" == "" ]]; then
     echo
     echo No java installations was detected.
     echo Please go to http://www.java.com/getjava/ and download
     echo
     exit 1
-  elif [[ "$java_version" < "$required_version" ]]; then
+  elif [[ "$good_enough" != "1" ]]; then
     echo
     echo The java installation you have is not up to date
     echo $script_name requires at least version $required_version+, you have
@@ -209,7 +210,8 @@ checkJava() {
 }
 
 copyRt() {
-  if [[ "$java_version" == "9" ]]; then
+  local at_least_9="$(echo "$java_version >= 9" | bc)"
+  if [[ "$at_least_9" == "1" ]]; then
     rtexport=$(rt_export_file)
     java9_ext=$("$java_cmd" ${JAVA_OPTS} ${SBT_OPTS:-$default_sbt_opts} ${java_args[@]} \
       -jar "$rtexport" --rt-ext-dir)