diff options
| author | Yves Fischer <yves.fischer@cern.ch> | 2016-05-30 11:58:34 +0200 |
|---|---|---|
| committer | Yves Fischer <yves.fischer@cern.ch> | 2016-05-30 11:58:34 +0200 |
| commit | 41b5090d169bfed6bba74a55081a75bbb143bfad (patch) | |
| tree | 814e2eb8e7e6e3532a96d1d0553ca0a8c4cd2209 | |
| parent | 8ad0e5bf8f8be61bb9ef30c19a275b680ad4f059 (diff) | |
| download | debian-packages-41b5090d169bfed6bba74a55081a75bbb143bfad.tar.gz debian-packages-41b5090d169bfed6bba74a55081a75bbb143bfad.zip | |
correct oraclejdk activator
| -rw-r--r-- | packages/oraclejdk/oracle.gradle | 5 | ||||
| -rw-r--r-- | packages/oraclejdk/oraclejdk7/build.gradle | 5 | ||||
| -rw-r--r-- | 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}" + } +} |