Skip to content
This repository has been archived by the owner on Apr 25, 2021. It is now read-only.

Changed references to downloading/installing/updating Java (JRE?) to … #195

Merged
merged 1 commit into from
Nov 13, 2017
Merged

Changed references to downloading/installing/updating Java (JRE?) to … #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/universal/bin/sbt-launch-lib.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/universal/bin/sbt.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down