fixing stuff

simonjj · Apr 9, 2012 · 120d74b · 120d74b
1 parent dfb2698
commit 120d74b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/chef-repo/cookbooks/java/attributes/default.rb b/chef-repo/cookbooks/java/attributes/default.rb
@@ -33,6 +33,8 @@
   default['java']['java_home'] = "/usr/lib/jvm/default-java"
 end
 
+default['java']['java_bin'] = default['java']['java_home'] + "/bin"
+
 # jdk6 attributes
 # x86_64
 default['java']['jdk']['6']['x86_64']['url'] = 'http://69.55.204.50/jdk-6u31-linux-x64.bin'

diff --git a/chef-repo/cookbooks/zenoss_build/templates/default/zenoss_bashrc.erb b/chef-repo/cookbooks/zenoss_build/templates/default/zenoss_bashrc.erb
@@ -8,5 +8,5 @@ fi
 # User specific aliases and functions
 export ZENHOME=/opt/zenoss
 export PYTHONPATH=$ZENHOME/lib/python
-export PATH=$PATH:$ZENHOME/bin:$PATH
+export PATH=$PATH:$ZENHOME/bin:<%= java_bin %>
 export INSTANCE_HOME=$ZENHOME