fix conflict introduced by dependent module

(#1)

Author: antoineco

manifests/download.pp

@@ -21,23 +21,33 @@
     group  => 'root'
   }
 
-  # download archive
-  Archive {
-    cookie  => 'oraclelicense=accept-securebackup-cookie',
-    source  => $oracle_java::downloadurl,
-    cleanup => false,
-    require => File['/usr/java']
-  }
-
-  # WITH checksum check
+  # with checksum check
   if $oracle_java::check_checksum {
     include oracle_java::checksums # get checksums list
-    archive { "/usr/java/${oracle_java::filename}":
+    Archive {
       checksum      => $oracle_java::checksums::checksum,
       checksum_type => 'md5'
     }
+  }
+
+  # download archive
+  if $oracle_java::format == 'rpm' {
+    archive { "/usr/java/${oracle_java::filename}":
+      cookie  => 'oraclelicense=accept-securebackup-cookie',
+      source  => $oracle_java::downloadurl,
+      cleanup => false,
+      require => File['/usr/java'],
+    }
   } else {
-    # WITHOUT checksum check
-    archive { "/usr/java/${oracle_java::filename}": }
+    # also extract if tar.gz
+    archive { "/usr/java/${oracle_java::filename}":
+      cookie       => 'oraclelicense=accept-securebackup-cookie',
+      source       => $oracle_java::downloadurl,
+      cleanup      => false,
+      require      => File['/usr/java'],
+      extract      => true,
+      extract_path => '/usr/java',
+      creates      => "/usr/java/${oracle_java::longversion}"
+    }
   }
-}
+}

manifests/init.pp

@@ -27,9 +27,10 @@
 # === Sample Usage:
 #
 #  class { 'oracle_java':
-#    version => '8u5',
-#    type    => 'jdk',
-#    format  => 'rpm'
+#    version         => '8u5',
+#    type            => 'jdk',
+#    format          => 'rpm',
+#    add_alternative => true
 #  }
 #
 class oracle_java ($version = '8', $type = 'jre', $format = undef, $check_checksum = true, $add_alternative = false) {

manifests/install/targz.pp

@@ -8,18 +8,6 @@
     fail('You must include the oracle_java base class before using any oracle_java sub class')
   }
 
-  # dependency
-  if !defined(Class['archive']) {
-    include archive
-  }
-
-  # extract archive
-  archive { 'extract java archive':
-    path         => "/usr/java/${oracle_java::filename}",
-    extract      => true,
-    extract_path => '/usr/java',
-    creates      => "/usr/java/${oracle_java::longversion}"
-  } ->
   # fix permissions
   file { "/usr/java/${oracle_java::longversion}":
     recurse  => true,
@@ -33,4 +21,4 @@
     ensure => link,
     target => "/usr/java/${oracle_java::longversion}"
   }
-}
+}