apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6926 setting java_home from installed java

Browse Source 
changed the order of preference to check for java first.

Usage server rpm installs JRE 1.7. In the case where JDK 1.6 is already
installed, java version would be 1.7 but, javac would be 1.6
If javac is given preference, usage server fails to start in this case.
This commit is contained in:
Rajani Karuturi 2014-09-12 14:56:48 +05:30
parent 283666b038
commit fa1156092e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packaging/centos63/cloud-usage.rc
View File

@ -52,12 +52,12 @@ setJavaHome() {
return return
fi fi
# try javac first # try java first
java=$(which javac 2>/dev/null || :) java=$(which java 2>/dev/null || :)
# try java if javac is not found # try javac if java is not found
if [ -z "$java" ] ; then if [ -z "$java" ] ; then
java=$(which java 2>/dev/null || :) java=$(which javac 2>/dev/null || :)
fi fi
if [ -n "$java" ] ; then if [ -n "$java" ] ; then

8
packaging/debian/init/cloud-usage
View File

@ -48,12 +48,12 @@ setJavaHome() {
return return
fi fi
# try javac first # try java first
java=$(which javac 2>/dev/null || :) java=$(which java 2>/dev/null || :)
# try java if javac is not found # try javac if java is not found
if [ -z "$java" ] ; then if [ -z "$java" ] ; then
java=$(which java 2>/dev/null || :) java=$(which javac 2>/dev/null || :)
fi fi
if [ -n "$java" ] ; then if [ -n "$java" ] ; then