From 7a0dc250a73b8b289ab416bd492582fcbbeb6015 Mon Sep 17 00:00:00 2001
From: Yves Fischer <yves.fischer@cern.ch>
Date: Mon, 15 Feb 2016 17:45:07 +0100
Subject: oraclejdk java7

---
 .../cern-scripts/resources/lib/environments.inc.sh | 31 +++++++++++++++-------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'packages/cern-scripts/resources/lib/environments.inc.sh')

diff --git a/packages/cern-scripts/resources/lib/environments.inc.sh b/packages/cern-scripts/resources/lib/environments.inc.sh
index a9398bc..8960d95 100644
--- a/packages/cern-scripts/resources/lib/environments.inc.sh
+++ b/packages/cern-scripts/resources/lib/environments.inc.sh
@@ -1,24 +1,40 @@
 
-function __env_ideajava8() {
-    export PATH=/opt/idea-iu15/bin:$PATH
+function __sub_java7() {
+    export JAVA_HOME=/usr/lib/jvm/java-7-oraclejdk
+    export PATH=$JAVA_HOME/bin:$PATH
+}
 
-    export JAVA_HOME=/usr/lib/jvm/java-8.66-oraclejdk
+function __sub_java8() {
+    export JAVA_HOME=/usr/lib/jvm/java-8-oraclejdk
     export PATH=$JAVA_HOME/bin:$PATH
+}
 
+function __sub_tools() {
+    export PATH=/opt/idea-iu15/bin:$PATH
     export PATH=/opt/gwt-chromium/bin:$PATH
 
     export PATH=/opt/grails3/bin:$PATH
 
     export PATH=/opt/cern-scripts/bin:$PATH
-    
+
     export TNS_ADMIN=/home/yfischer/.cache/tnsnames/admin_localhost
     export JAVA_OPTS="-Doracle.net.tns_admin=$TNS_ADMIN"
     export GRADLE_OPTS="-Doracle.net.tns_admin=$TNS_ADMIN"
+}
 
-    export PATH=/opt/gwt-chromium/bin:$PATH
+function __env_ideajava8() {
+    __sub_java8
+    __sub_tools
+}
+
+function __env_ideajava7() {
+    __sub_java7
+    __sub_tools
 }
 
 function __env_fwk24() {
+    __sub_java7
+
     export PATH=/opt/idea-iu15/bin:$PATH
     export PATH=/opt/gwt-chromium/bin:$PATH
     export PATH=/opt/grails2.2.1/bin:$PATH
@@ -27,9 +43,4 @@ function __env_fwk24() {
     export TNS_ADMIN=/home/yfischer/.cache/tnsnames/admin_localhost
     export JAVA_OPTS="-Doracle.net.tns_admin=$TNS_ADMIN"
     export GRADLE_OPTS="-Doracle.net.tns_admin=$TNS_ADMIN"
-
-    export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/
-    export PATH=$JAVA_HOME/bin:$PATH
 }
-
-
-- 
cgit v1.2.1