Merge pull request #291 from bitnexus/fix-path-for-phpunit-freebsd

Fix paths for phpunit on FreeBSD
voxpupuli · May 7, 2018 · 0a69781 · 0a69781
2 parents 1bba491 + d94c0fa
commit 0a69781
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/manifests/phpunit.pp b/manifests/phpunit.pp
@@ -17,6 +17,7 @@
 class php::phpunit (
   String $source             = $php::params::phpunit_source,
   Stdlib::Absolutepath $path = $php::params::phpunit_path,
+  String[1] $root_group      = $php::params::root_group,
   Boolean $auto_update       = true,
   Integer $max_age           = $php::params::phpunit_max_age,
 ) inherits php::params {
@@ -28,13 +29,13 @@
   exec { 'download phpunit':
     command => "wget ${source} -O ${path}",
     creates => $path,
-    path    => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/'],
+    path    => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/', '/usr/local/bin', '/usr/local/sbin'],
     require => [Class['php::cli'],Package['wget']],
   }
   -> file { $path:
     mode  => '0555',
     owner => root,
-    group => root,
+    group => $root_group,
   }
 
   if $auto_update {

diff --git a/manifests/phpunit/auto_update.pp b/manifests/phpunit/auto_update.pp
@@ -22,7 +22,7 @@
   exec { 'update phpunit':
     command => "wget ${source} -O ${path}",
     onlyif  => "test `find '${path}' -mtime +${max_age}`",
-    path    => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ],
+    path    => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/', '/usr/local/bin', '/usr/local/sbin' ],
     require => File[$path],
   }
 }