From fa249d18855b382a4905b0850f34b319e43eab3b Mon Sep 17 00:00:00 2001 From: ljainpivotalio Date: Tue, 28 Mar 2017 19:03:04 -0700 Subject: [PATCH] Set the default_value of JAVA_HOME for running RPS --- ranger-plugin/scripts/enable-ranger-plugin.sh | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/ranger-plugin/scripts/enable-ranger-plugin.sh b/ranger-plugin/scripts/enable-ranger-plugin.sh index 05a0b1d347..2fa7162c17 100755 --- a/ranger-plugin/scripts/enable-ranger-plugin.sh +++ b/ranger-plugin/scripts/enable-ranger-plugin.sh @@ -150,7 +150,7 @@ function validate_params() { get_hawq_password echo "RANGER URL = ${RANGER_URL}" echo "RANGER User = ${RANGER_USER}" - echo "RANGER Password = $(mask ${RANGER_PASSWORD})" + echo "RANGER Password = $(mask ${RANGER_PASSWORD})" echo "HAWQ HOST = ${HAWQ_HOST}" echo "HAWQ PORT = ${HAWQ_PORT}" echo "HAWQ User = ${HAWQ_USER}" @@ -211,6 +211,28 @@ function update_ranger_url() { echo "Updated POLICY_MGR_URL to ${policy_mgr_url} in ${prop_file}" } +function update_java_home() { + local jdk64="/usr/jdk64" + local java_sdk="/etc/alternatives/java_sdk" + + if [[ -d ${jdk64} ]]; then + local DIR_NAME=$(ls ${jdk64} | sort -r | head -1) + if [[ ${DIR_NAME} ]]; then + JAVA_HOME_DIR="${jdk64}/${DIR_NAME}" + fi + elif [[ -d ${java_sdk} ]]; then + JAVA_HOME_DIR="${java_sdk}" + fi + + if [[ ${JAVA_HOME_DIR} ]]; then + local prop_file=$(dirname ${SCRIPT_DIR})/etc/rps.properties + sed -i -e "s|/usr/java/default|${JAVA_HOME_DIR}|g" ${prop_file} + echo "Updated default value of JAVA_HOME to ${JAVA_HOME_DIR} in ${prop_file}" + elif [[ ! ${JAVA_HOME} ]]; then + echo "Unable to locate JAVA_HOME on this machine. Please modify the default value of JAVA_HOME in ${prop_file}." + fi +} + main() { if [[ $# -lt 1 ]]; then usage @@ -221,5 +243,6 @@ main() { create_hawq_service_definition create_hawq_service_instance update_ranger_url + update_java_home } main "$@"