On Unix, add a sensible exec PATH

since i don't know much about Windows, I'm leaving that as is for now. But in terms of escaping / testing, and consolidating! our testing, it would make sense to extend it to Windows as well.
voxpupuli · Nov 17, 2020 · ed516f6 · ed516f6
1 parent 532eead
commit ed516f6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/manifests/npm.pp b/manifests/npm.pp
@@ -45,13 +45,21 @@
   $list_command = "${npm_path} ls --long --parseable"
   $install_check = "${list_command} | ${grep_command} \"${target}${dirsep}node_modules${dirsep}${install_check_package_string}\""
 
+  # set a sensible path on Unix
+  $exec_path = $facts['os']['family'] ? {
+    'Windows' => undef,
+    'Darwin'  => ['/bin', '/usr/bin', '/opt/local/bin', '/usr/local/bin'],
+    default    => ['/bin', '/usr/bin', '/usr/local/bin'],
+  }
+
   if $ensure == 'absent' {
     $npm_command = 'rm'
     $options = $uninstall_options_string
 
     if $use_package_json {
       exec { "npm_${npm_command}_${name}":
         command => "${npm_path} ${npm_command} * ${options}",
+        path    => $exec_path,
         onlyif  => $list_command,
         user    => $user,
         cwd     => "${target}${dirsep}node_modules",
@@ -60,6 +68,7 @@
     } else {
       exec { "npm_${npm_command}_${name}":
         command => "${npm_path} ${npm_command} ${package_string} ${options}",
+        path    => $exec_path,
         onlyif  => $install_check,
         user    => $user,
         cwd     => $target,
@@ -76,6 +85,7 @@
     if $use_package_json {
       exec { "npm_${npm_command}_${name}":
         command     => "${npm_path} ${npm_command} ${options}",
+        path        => $exec_path,
         unless      => $list_command,
         user        => $user,
         cwd         => $target,
@@ -85,6 +95,7 @@
     } else {
       exec { "npm_${npm_command}_${name}":
         command     => "${npm_path} ${npm_command} ${package_string} ${options}",
+        path        => $exec_path,
         unless      => $install_check,
         user        => $user,
         cwd         => $target,

diff --git a/manifests/npm/global_config_entry.pp b/manifests/npm/global_config_entry.pp
@@ -61,8 +61,16 @@
     default   => 'shell',
   }
 
+  # set a sensible path on Unix
+  $exec_path = $facts['os']['family'] ? {
+    'Windows' => undef,
+    'Darwin'  => ['/bin', '/usr/bin', '/opt/local/bin', '/usr/local/bin'],
+    default    => ['/bin', '/usr/bin', '/usr/local/bin'],
+  }
+
   exec { "npm_config ${ensure} ${title}":
     command  => "${npm_path} ${command}",
+    path     => $exec_path,
     provider => $provider,
     onlyif   => $onlyif_command,
     require  => $exec_require,