From 41b5090d169bfed6bba74a55081a75bbb143bfad Mon Sep 17 00:00:00 2001
From: Yves Fischer <yves.fischer@cern.ch>
Date: Mon, 30 May 2016 11:58:34 +0200
Subject: correct oraclejdk activator

---
 packages/oraclejdk/oracle.gradle           | 5 -----
 packages/oraclejdk/oraclejdk7/build.gradle | 5 +++++
 packages/oraclejdk/oraclejdk8/build.gradle | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/oraclejdk/oracle.gradle b/packages/oraclejdk/oracle.gradle
index 498b3d7..03977d7 100644
--- a/packages/oraclejdk/oracle.gradle
+++ b/packages/oraclejdk/oracle.gradle
@@ -27,8 +27,3 @@ project.afterEvaluate {
 }
 
 tasks.getByName('activator').dependsOn('untar')
-tasks.getByName('activator').doFirst {
-  file("${buildDir}/unpacked/dist/bin").list().each {
-    activator.bin[it] = "/opt/${project.name}/bin/${it}"
-  }
-}
diff --git a/packages/oraclejdk/oraclejdk7/build.gradle b/packages/oraclejdk/oraclejdk7/build.gradle
index f0ee830..e47e237 100644
--- a/packages/oraclejdk/oraclejdk7/build.gradle
+++ b/packages/oraclejdk/oraclejdk7/build.gradle
@@ -9,3 +9,8 @@ ospackage {
   into '/usr/lib/jvm/java-7-oraclejdk'
 }
 activator.env['JAVA_HOME'] = '/usr/lib/jvm/java-7-oraclejdk'
+tasks.getByName('activator').doFirst {
+  file("${buildDir}/unpacked/dist/bin").list().each {
+    activator.bin[it] = "/usr/lib/jvm/java-8-oraclejdk/bin/${it}"
+  }
+}
diff --git a/packages/oraclejdk/oraclejdk8/build.gradle b/packages/oraclejdk/oraclejdk8/build.gradle
index d6d73c7..98c16a1 100644
--- a/packages/oraclejdk/oraclejdk8/build.gradle
+++ b/packages/oraclejdk/oraclejdk8/build.gradle
@@ -10,3 +10,8 @@ ospackage {
 }
 
 activator.env['JAVA_HOME'] = '/usr/lib/jvm/java-8-oraclejdk'
+tasks.getByName('activator').doFirst {
+  file("${buildDir}/unpacked/dist/bin").list().each {
+    activator.bin[it] = "/usr/lib/jvm/java-8-oraclejdk/bin/${it}"
+  }
+}
-- 
cgit v1.2.1