Merge pull request #125 from linc01n/hotfix/java-path

linc01n · linc01n · commit 272b2591bd93 · 2015-11-14T22:24:11.000+08:00
Fix hard-coded JAVA_HOME ENV
diff --git a/templates/default/bitbucket/setenv.sh.erb b/templates/default/bitbucket/setenv.sh.erb
@@ -12,7 +12,7 @@ if [ "x${BITBUCKET_HOME}" = "x" ]; then
 fi
 
 if [ "x${JAVA_HOME}" = "x" ]; then
-    export JAVA_HOME=/usr/lib/jvm/jdk1.8.0_51/jre
+    export JAVA_HOME="<%= node['java']['java_home'] %>"
 fi
 
 #

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ if [ "x${BITBUCKET_HOME}" = "x" ]; then`
`12`	`12`	`fi`
`13`	`13`
`14`	`14`	`if [ "x${JAVA_HOME}" = "x" ]; then`
`15`		`- export JAVA_HOME=/usr/lib/jvm/jdk1.8.0_51/jre`
	`15`	`+ export JAVA_HOME="<%= node['java']['java_home'] %>"`
`16`	`16`	`fi`
`17`	`17`
`18`	`18`	`#`