From da023352613dc8110ad6bf8dac46f71cc64a41b4 Mon Sep 17 00:00:00 2001 From: Brett Randall Date: Fri, 10 Nov 2017 19:46:42 +0000 Subject: [PATCH] Changed references to downloading/installing/updating Java (JRE?) to refer to JDK. Updated download URLs. Fixed #115. --- src/universal/bin/sbt-launch-lib.bash | 10 +++++----- src/universal/bin/sbt.bat | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/universal/bin/sbt-launch-lib.bash b/src/universal/bin/sbt-launch-lib.bash index 365574040..a2dba7ce8 100755 --- a/src/universal/bin/sbt-launch-lib.bash +++ b/src/universal/bin/sbt-launch-lib.bash @@ -207,18 +207,18 @@ checkJava() { 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 "No Java Development Kit (JDK) installation was detected." + echo Please go to http://www.oracle.com/technetwork/java/javase/downloads/ and download. echo exit 1 elif [[ "$good_enough" != "1" ]]; then echo - echo The java installation you have is not up to date + echo "The Java Development Kit (JDK) installation you have is not up to date." echo $script_name requires at least version $required_version+, you have echo version $java_version echo - echo Please go to http://www.java.com/getjava/ and download - echo a valid Java Runtime and install before running $script_name. + echo Please go to http://www.oracle.com/technetwork/java/javase/downloads/ and download + echo a valid JDK and install before running $script_name. echo exit 1 fi diff --git a/src/universal/bin/sbt.bat b/src/universal/bin/sbt.bat index 63788d2b1..8a43b1fb9 100644 --- a/src/universal/bin/sbt.bat +++ b/src/universal/bin/sbt.bat @@ -118,12 +118,12 @@ if /I "%JAVA_VERSION%" GEQ "%required_version%" ( exit /B 0 ) echo. -echo The java installation you have is not up to date +echo The Java Development Kit (JDK) installation you have is not up to date. echo sbt requires at least version %required_version%+, you have echo version %JAVA_VERSION% echo. -echo Please go to http://www.java.com/getjava/ and download -echo a valid Java Runtime and install before running sbt. +echo Please go to http://www.oracle.com/technetwork/java/javase/downloads/ and download +echo a valid JDK and install before running sbt. echo. exit /B 1