Merge branch 'master' of https://github.com/boxen/puppet-java

README.md

@@ -14,7 +14,7 @@ include java
 
 ## Parameters
 
-You can customise this module by configuring some optional class parameters. Usually you'd do this via Hiera, but you could also explicitly pass those parameters in puppet code like `class { 'java': $update_version => '42', }`.
+You can customise this module by configuring some optional class parameters. Usually you'd do this via Hiera, but you could also explicitly pass those parameters in puppet code like `class { 'java': update_version => '42', }`.
 
 * `update_version`: The 'update' part of the JRE/JDK version to install. For example, if you specify `51`, the module would install java 7u51
 * `base_download_url`: A base path from which the JRE and JDK packages should be downloaded. For example, if you specify `https://myorg.example/dist/java`, this module would download the jre from `https://myorg.example/dist/java/jre-7u51-macosx-x64.dmg`.

files/java.sh

@@ -3,6 +3,10 @@
 # Invoke java with the $DYLD_LIBRARY_PATH set with the homebrew lib dir.
 # This allows java to load native libraries installed via homebrew.
 
+if [ -z "$DYLD_FALLBACK_LIBRARY_PATH" ]; then
+    DYLD_FALLBACK_LIBRARY_PATH="$HOME/lib:/usr/local/lib:/lib:/usr/lib"
+fi
+
 export DYLD_FALLBACK_LIBRARY_PATH="$BOXEN_HOME/homebrew/lib:$DYLD_FALLBACK_LIBRARY_PATH"
 
 if [ -x /usr/libexec/java_home ]; then

manifests/init.pp

@@ -4,7 +4,7 @@
 #
 #    include java
 class java (
-  $update_version = '51',
+  $update_version = '71',
   $base_download_url = 'https://s3.amazonaws.com/boxen-downloads/java'
 ) {
   include boxen::config