minor code fixes

Author: antoineco

manifests/download.pp

@@ -5,9 +5,11 @@
     fail('You must include the oracle_java base class before using any oracle_java sub class')
   }
 
-  include ::archive
+  if !defined(Class['archive']) {
+    include archive
+  }
 
-  $require_extraction = $oracle_java::type ? {
+  $require_extraction = $oracle_java::format ? {
     'tar.gz' => true,
     default  => false
   }
@@ -28,6 +30,6 @@
     extract      => $require_extraction,
     extract_path => '/usr/java',
     creates      => "/usr/java/${oracle_java::longversion}",
-    cleanup      => true,
+    cleanup      => true
   }
 }

manifests/init.pp

@@ -190,4 +190,5 @@
 
   include oracle_java::download
   include oracle_java::install
+  Class['oracle_java::download'] -> Class['oracle_java::install']
 }

manifests/install.pp

@@ -17,8 +17,7 @@
     package { $oracle_java::packagename:
       ensure   => latest,
       source   => "/usr/java/${oracle_java::filename}",
-      provider => rpm,
-      require  => Exec['download java RPM']
+      provider => rpm
     }
   }
   # the procedure is a bit more complicated for Java 6...
@@ -29,7 +28,7 @@
       cwd     => '/usr/java',
       creates => "/usr/java/${oracle_java::filename_extracted}",
       command => "sed -ni '/exit 0/,\${//!p}' ${oracle_java::filename}; chmod +x ${oracle_java::filename}; ./${oracle_java::filename}",
-      require => [Package['sed'], Exec['download java RPM']]
+      require => Package['sed']
     } ~>
     # remove undesired extra RPMs
     exec { 'cleanup java RPM':