Merge pull request rvm#3720 from rvm/3719-adding-jdk8-to-ubuntu-requirements

raelgc · web-flow · commit 7115d0b402a3 · 2016-07-15T12:48:27.000-03:00
Adding jdk8 to ubuntu requirements (rvm#3719)
diff --git a/scripts/functions/requirements/ubuntu b/scripts/functions/requirements/ubuntu
@@ -58,6 +58,7 @@ requirements_debian_define_java()
 {
   update-alternatives --list ${1:-java} >/dev/null 2>&1 ||
     requirements_check_fallback \
+      openjdk-8-jre-headless openjdk-8-jdk oracle-j2sdk1.8 \
       openjdk-7-jre-headless openjdk-7-jdk oracle-j2sdk1.7 \
       openjdk-6-jre-headless opendjk-6-jdk oracle-j2sdk1.6
 }

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ requirements_debian_define_java()`
`58`	`58`	`{`
`59`	`59`	`update-alternatives --list ${1:-java} >/dev/null 2>&1 \|\|`
`60`	`60`	`requirements_check_fallback \`
	`61`	`+ openjdk-8-jre-headless openjdk-8-jdk oracle-j2sdk1.8 \`
`61`	`62`	`openjdk-7-jre-headless openjdk-7-jdk oracle-j2sdk1.7 \`
`62`	`63`	`openjdk-6-jre-headless opendjk-6-jdk oracle-j2sdk1.6`
`63`	`64`	`}`