v1.1.4

* Fix bug in package name for Java 8u20
* Renamed exec resources to something less generic (avoid conflicts)

Author: antoineco

CHANGELOG.md

@@ -1,3 +1,8 @@
+###1.1.4
+
+* Fix bug in package name for Java 8u20
+* Renamed exec resources to something less generic (avoid conflicts)
+
 ###1.1.3
 
 * Add support for Java '8u20'

manifests/init.pp

@@ -151,6 +151,12 @@
   }
   $downloadurl = "http://download.oracle.com/otn-pub/java/jdk/${version_final}${build}/${filename}"
 
+  # define package name
+  $packagename = $version_real ? {
+    '8u20'  => "${type}1.${maj_version}.0_${min_version}",
+    default => $type
+  }
+
   # make sure install/download directory exists
   file { '/usr/java':
     ensure => directory,
@@ -159,22 +165,22 @@
     group  => 'root'
   } ->
   # download RPM
-  exec { 'downloadRPM':
+  exec { 'download java RPM':
     path    => '/usr/bin',
     cwd     => '/usr/java',
     creates => "/usr/java/${filename}",
     command => "wget --no-cookies --no-check-certificate --header \"Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie\" \"${downloadurl}\"",
     timeout => 0,
     require => Package['wget']
   }
-
+  
   # install package
   if $maj_version >= 7 {
-    package { $type:
+    package { $packagename:
       ensure   => latest,
       source   => "/usr/java/${filename}",
       provider => rpm,
-      require  => Exec['downloadRPM']
+      require  => Exec['download java RPM']
     }
   }
   # the procedure is a bit more complicated for older versions...
@@ -189,21 +195,21 @@
     # the extracted file includes the 'new' arch string
     $filename_extract = "${type}-${version_final}-linux-${arch_final}.rpm"
 
-    exec { 'unpackRPM':
+    exec { 'unpack java RPM':
       path    => '/bin',
       cwd     => '/usr/java',
       creates => "/usr/java/${filename_extract}",
       command => "sed -ni '/exit 0/,\${//!p}' ${filename}; chmod +x ${filename}; ./${filename}",
-      require => [Package['sed'], Exec['downloadRPM']]
+      require => [Package['sed'], Exec['download java RPM']]
     } ~>
     # remove undesired extra RPMs
-    exec { 'cleanupRPM':
+    exec { 'cleanup java RPM':
       path        => '/bin',
       cwd         => '/usr/java',
       refreshonly => true,
       command     => 'rm -f sun-javadb-*.rpm'
     } ->
-    package { $type:
+    package { $packagename:
       ensure   => latest,
       source   => "/usr/java/${filename_extract}",
       provider => rpm

metadata.json

@@ -5,7 +5,7 @@
   "project_page": "https://github.com/tOnI0/aco-oracle_java",
   "source": "git://github.com/tOnI0/aco-oracle_java.git",
   "summary": "Puppet module to install Oracle Java on RPM-based Linux systems",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "tags": ["rpm","jre","jdk","oracle","java"],
   "dependencies": [
     {