openstack
/
sahara-image-elements
Code Issues Proposed changes

Move JRE_PATH/bin export to separate file 

It's needed for correct getting JAVA_HOME path in sahara code.
Aslo this patch added JDK utils to PATH

Change-Id: I07895f4c6e76fb0cebcae11d73a52bc7da42e14d
Closes-bug: #1493317
This commit is contained in:
Sergey Reshetnyak 2015-09-08 14:02:33 +03:00
parent 0ff4eab4bb
commit aff08ddce5
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elements/java/bin/setup-java-home
View File

@ -20,9 +20,12 @@ JRE_HOME=$1
JDK_HOME=$2
echo "export JAVA_HOME=$JRE_HOME" >> $JAVA_RC
echo "export PATH=$JRE_HOME/bin:\$PATH" >> $JAVA_RC
chmod +x $JAVA_RC
echo "export PATH=$JRE_HOME/bin:\$PATH" >> $JAVA_BIN_RC
echo "export PATH=$JDK_HOME/bin:\$PATH" >> $JAVA_BIN_RC
chmod +x $JAVA_BIN_RC
echo "Setting up alternatives for Java"
case "$DISTRO_NAME" in

1
elements/java/cleanup.d/00-clean-java-vars
View File

@ -7,4 +7,5 @@ set -eu
set -o pipefail
unset DIB_JAVA_DISTRO
unset JAVA_BIN_RC
unset JAVA_RC

1
elements/java/environment.d/00-java-rc
View File

@ -1 +1,2 @@
export JAVA_RC="/etc/profile.d/99-java.sh"
export JAVA_BIN_RC="/etc/profile.d/98-java-bin.sh"