diff options
| -rw-r--r-- | lib/puppet/util.rb | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb index e1e699286..6f83c7ac5 100644 --- a/lib/puppet/util.rb +++ b/lib/puppet/util.rb @@ -185,19 +185,14 @@ module Util def binary(bin) if bin =~ /^\// - if FileTest.file? bin and FileTest.executable? bin - return bin - else - return nil - end + return bin if FileTest.file? bin and FileTest.executable? bin else - x = %x{which #{bin} 2>/dev/null}.chomp - if x == "" - return nil - else - return x - end + ENV['PATH'].split(File::PATH_SEPARATOR).each do |dir| + dest=File.join(dir, bin) + return dest if FileTest.file? dest and FileTest.executable? dest + end end + return nil end module_function :binary |