Merge pull request #54 from boxen/fix-java-8

Don't blow up when Java 8 is installed.
boxen · Mar 9, 2015 · 35f27ea · 35f27ea
2 parents abb8949 + 3e73ab5
commit 35f27ea
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 40 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -21,50 +21,49 @@
     fail('Yosemite Requires Java 7 with a patch level >= 71 (Bug JDK-8027686)')
   }
 
-  package {
-    "jre-7u${update_version}.dmg":
-      ensure   => present,
-      alias    => 'java-jre',
-      provider => pkgdmg,
-      source   => $jre_url ;
-    "jdk-7u${update_version}.dmg":
-      ensure   => present,
-      alias    => 'java',
-      provider => pkgdmg,
-      source   => $jdk_url ;
-  }
-
   file { $wrapper:
     source  => 'puppet:///modules/java/java.sh',
-    mode    => '0755',
-    require => Package['java']
+    mode    => '0755'
   }
 
+  if (versioncmp($::java_version, '1.8.0') < 0) {
+    package {
+      "jre-7u${update_version}.dmg":
+        ensure   => present,
+        alias    => 'java-jre',
+        provider => pkgdmg,
+        source   => $jre_url ;
+      "jdk-7u${update_version}.dmg":
+        ensure   => present,
+        alias    => 'java',
+        provider => pkgdmg,
+        source   => $jdk_url ;
+    }
 
-  # Allow 'large' keys locally.
-  # http://www.ngs.ac.uk/tools/jcepolicyfiles
+    # Allow 'large' keys locally.
+    # http://www.ngs.ac.uk/tools/jcepolicyfiles
+    file { $sec_dir:
+      ensure  => 'directory',
+      owner   => 'root',
+      group   => 'wheel',
+      mode    => '0775',
+      require => Package['java']
+    }
 
-  file { $sec_dir:
-    ensure  => 'directory',
-    owner   => 'root',
-    group   => 'wheel',
-    mode    => '0775',
-    require => Package['java']
-  }
-
-  file { "${sec_dir}/local_policy.jar":
-    source  => 'puppet:///modules/java/local_policy.jar',
-    owner   => 'root',
-    group   => 'wheel',
-    mode    => '0664',
-    require => File[$sec_dir]
-  }
+    file { "${sec_dir}/local_policy.jar":
+      source  => 'puppet:///modules/java/local_policy.jar',
+      owner   => 'root',
+      group   => 'wheel',
+      mode    => '0664',
+      require => File[$sec_dir]
+    }
 
-  file { "${sec_dir}/US_export_policy.jar":
-    source  => 'puppet:///modules/java/US_export_policy.jar',
-    owner   => 'root',
-    group   => 'wheel',
-    mode    => '0664',
-    require => File[$sec_dir]
+    file { "${sec_dir}/US_export_policy.jar":
+      source  => 'puppet:///modules/java/US_export_policy.jar',
+      owner   => 'root',
+      group   => 'wheel',
+      mode    => '0664',
+      require => File[$sec_dir]
+    }
   }
 }
diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb
@@ -28,8 +28,7 @@
 
     should contain_file('/test/boxen/bin/java').with({
       :source  => 'puppet:///modules/java/java.sh',
-      :mode    => '0755',
-      :require => 'Package[java]'
+      :mode    => '0755'
     })
   end