luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #195 from javabrett/refer-jdk-not-jre 

Changed references to downloading/installing/updating Java (JRE?) to …
This commit is contained in:
Dale Wijnand 2017-11-13 11:50:02 +00:00 committed by GitHub
parent 30a5038b71 da02335261
commit 320d993fa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/universal/bin/sbt-launch-lib.bash
View File

@ -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

6
src/universal/bin/sbt.bat
View File

@ -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