Merge pull request #495 from travis-ci/ha-bug-fix-mavenrc

Fix /etc/mavenrc
travis-ci · Jul 22, 2015 · 0ff7393 · 0ff7393
2 parents 947fb7b + f073ae9
commit 0ff7393
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ci_environment/maven/templates/default/mavenrc.erb b/ci_environment/maven/templates/default/mavenrc.erb
@@ -1,3 +1,3 @@
-[ -z "$M2_HOME" ] && export M2_HOME=<%= node['maven']['m2_home'] %>
+[ -z "$M2_HOME" ] && export M2_HOME=${M2_HOME:-<%= node['maven']['m2_home'] %>}
 
 [ -z "$MAVEN_OPTS" ] && export MAVEN_OPTS="<%= node['maven']['mavenrc']['opts'] %>"