Add param validation for install_path and fallback to tar.gz

Author: antoineco

README.md

@@ -77,7 +77,7 @@ oracle_java::installation { '7u65':
 }
 ```
 
-Force installation from standard tar.gz archive and in a custom location
+Force installation from standard tar.gz archive, in a custom location
 
 ```puppet
 class { 'oracle_java':
@@ -138,7 +138,7 @@ Add `JAVA_HOME` environment variable to the `/etc/environment` file. Boolean val
 
 #####`custom_download_url`
 
-Do not download the Oracle Java archive from Oracle servers, instead use an alternative URL (example: `http://repo.mycompany.com/jdk-8u66-linux-x64.tar.gz`). Requires `format` set to `tar.gz`
+Do not download the Oracle Java archive from Oracle servers, instead use an alternative URL (example: `http://myrepo.com/jdk-8u66-linux-x64.tar.gz`)
 
 #####`custom_checksum`
 

manifests/checksums.pp

@@ -8,7 +8,7 @@
     fail('You must include the oracle_java base class before using any oracle_java sub class')
   }
 
-  if $oracle_java::custom_checksum == undef {
+  if !$oracle_java::custom_checksum {
     case $oracle_java::filename {
       # 8u66
       'jdk-8u66-linux-i586.rpm'    : { $checksum = 'a35792c4d9ae325404148b90ce632076' }

manifests/init.pp

@@ -19,7 +19,7 @@
 # [*add_system_env*]
 #   add system-wide Java environment variables (boolean)
 # [*custom_download_url*]
-#   fetch the package from an alternative URL. Requires 'tar.gz' format
+#   fetch the package from an alternative URL
 # [*custom_checksum*]
 #   use a custom checksum to verify the archive integrity
 #
@@ -54,9 +54,13 @@
   ) {
   if !$format {
     if $::osfamily =~ /RedHat|Suse/ or $::operatingsystem == 'Mageia' {
-      $format_real = 'rpm'
-    } else {
-      $format_real = 'tar.gz'
+      case $install_path {
+        '/usr/java' : { $format_real = 'rpm' }
+        default     : {
+          notice("'install_path' set to custom location on RPM platform, falling back to tar.gz installation")
+          $format_real = 'tar.gz'
+        }
+      }
     }
   } else {
     $format_real = $format
@@ -67,6 +71,7 @@
   validate_re($type, '^(jre|jdk)$', '$type must be either \'jre\' or \'jdk\'')
   validate_re($format_real, '^(rpm|tar\.gz)$', '$format must be either \'rpm\' or \'tar.gz\'')
   validate_bool($check_checksum, $add_alternative)
+  validate_absolute_path($install_path)
 
   # set to latest release if no minor version was provided
   if $version == '8' {

manifests/installation.pp

@@ -146,7 +146,7 @@
     }
   }
   #-- end javalist --#
-  if $custom_download_url == undef {
+  if !$custom_download_url {
     $downloadurl = "http://download.oracle.com/otn-pub/java/jdk/${version_final}${build}/${filename}"
   } else {
     $downloadurl = $custom_download_url
@@ -171,7 +171,7 @@
   # with checksum check
   if $check_checksum {
     #-- start checksum --#
-    if $custom_checksum == undef {
+    if !$custom_checksum {
       case $filename {
         # 8u66
         'jdk-8u66-linux-i586.rpm'    : { $checksum = 'a35792c4d9ae325404148b90ce632076' }