From 9a57cd1dc582235a95208adcd85965bbfb0aa574 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Mon, 22 Apr 2019 18:53:48 +0200
Subject: [PATCH] r_connector: JAVA_HOME is now a runtime variable.
---
smartgears/r_connector/tasks/main.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/smartgears/r_connector/tasks/main.yml b/smartgears/r_connector/tasks/main.yml
index 5f114d8..edfa289 100644
--- a/smartgears/r_connector/tasks/main.yml
+++ b/smartgears/r_connector/tasks/main.yml
@@ -110,7 +110,8 @@
- block:
- name: Reconfigure the Java environment for R
- shell: export JAVA_HOME=/usr/lib/jvm/java-8-oracle ; export J2SDKDIR=/usr/lib/jvm/java-8-oracle ; export J2REDIR=/usr/lib/jvm/java-8-oracle/jre ; R CMD javareconf
+ shell: export JAVA_HOME={{ jdk_java_home }} ; export J2SDKDIR={{ jdk_java_home ; export J2REDIR={{ jdk_java_home }}/jre ; R CMD javareconf
+ when: jdk_java_home is defined
become: True
become_user: root