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

Merge pull request #199 from thatfulvioguy/use-expr-over-bc 

Use expr instead of bc when checking Java versions.
This commit is contained in:
Dale Wijnand 2017-11-16 16:21:28 +00:00 committed by GitHub
parent efdc7c90ca 6ad16c2b74
commit 7d70f0966c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -91,7 +91,7 @@ val root = (project in file(".")).
}, },
// Used to have "openjdk-8-jdk" but that doesn't work on Ubuntu 14.04 https://github.com/sbt/sbt/issues/3105 // Used to have "openjdk-8-jdk" but that doesn't work on Ubuntu 14.04 https://github.com/sbt/sbt/issues/3105
// before that we had java6-runtime-headless" and that was pulling in JDK9 on Ubuntu 16.04 https://github.com/sbt/sbt/issues/2931 // before that we had java6-runtime-headless" and that was pulling in JDK9 on Ubuntu 16.04 https://github.com/sbt/sbt/issues/2931
debianPackageDependencies in Debian ++= Seq("bash (>= 3.2)", "bc"), debianPackageDependencies in Debian ++= Seq("bash (>= 3.2)"),
debianPackageRecommends in Debian += "git", debianPackageRecommends in Debian += "git",
linuxPackageMappings in Debian += { linuxPackageMappings in Debian += {
val bd = sourceDirectory.value val bd = sourceDirectory.value

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

@ -118,7 +118,7 @@ get_mem_opts () {
} }
get_gc_opts () { get_gc_opts () {
local older_than_9="$(echo "$java_version < 9" | bc)" local older_than_9="$(expr $java_version "<" 9)"
if [[ "$older_than_9" == "1" ]]; then if [[ "$older_than_9" == "1" ]]; then
# don't need to worry about gc # don't need to worry about gc
@ -204,7 +204,7 @@ syncPreloaded() {
checkJava() { checkJava() {
local required_version="$1" local required_version="$1"
# Now check to see if it's a good enough version # Now check to see if it's a good enough version
local good_enough="$(echo "$java_version >= $required_version" | bc)" local good_enough="$(expr $java_version ">=" $required_version)"
if [[ "$java_version" == "" ]]; then if [[ "$java_version" == "" ]]; then
echo echo
echo "No Java Development Kit (JDK) installation was detected." echo "No Java Development Kit (JDK) installation was detected."
@ -225,7 +225,7 @@ checkJava() {
} }
copyRt() { copyRt() {
local at_least_9="$(echo "$java_version >= 9" | bc)" local at_least_9="$(expr $java_version ">=" 9)"
if [[ "$at_least_9" == "1" ]]; then if [[ "$at_least_9" == "1" ]]; then
rtexport=$(rt_export_file) rtexport=$(rt_export_file)
java9_ext=$("$java_cmd" ${JAVA_OPTS} ${SBT_OPTS:-$default_sbt_opts} ${java_args[@]} \ java9_ext=$("$java_cmd" ${JAVA_OPTS} ${SBT_OPTS:-$default_sbt_opts} ${java_args[@]} \