diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2011-02-08 12:18:31 -0800 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2011-02-08 12:18:31 -0800 |
| commit | 0971bda3d7b75a5292268b3a6acb1724fbb9852c (patch) | |
| tree | 5ac3a9edb75cc9913afa691efea936400b1972dc /lib/puppet/util | |
| parent | e0613d808f52d08bc1a2fb4e075749f486d7768b (diff) | |
| parent | 7b3b56ef7bfd32d7afb47fd71c2d9f606856d2e0 (diff) | |
| download | puppet-0971bda3d7b75a5292268b3a6acb1724fbb9852c.tar.gz puppet-0971bda3d7b75a5292268b3a6acb1724fbb9852c.tar.xz puppet-0971bda3d7b75a5292268b3a6acb1724fbb9852c.zip | |
Merge remote branch 'dan/ticket/2.6.4/5977' into 2.6.next
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/command_line.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb index 3562a3dc0..4aff0a8cb 100644 --- a/lib/puppet/util/command_line.rb +++ b/lib/puppet/util/command_line.rb @@ -33,8 +33,12 @@ module Puppet end def available_subcommands - absolute_appdir = $LOAD_PATH.collect { |x| File.join(x,'puppet','application') }.detect{ |x| File.directory?(x) } - Dir[File.join(absolute_appdir, '*.rb')].map{|fn| File.basename(fn, '.rb')} + absolute_appdirs = $LOAD_PATH.collect do |x| + File.join(x,'puppet','application') + end.select{ |x| File.directory?(x) } + absolute_appdirs.inject([]) do |commands, dir| + commands + Dir[File.join(dir, '*.rb')].map{|fn| File.basename(fn, '.rb')} + end.uniq end def usage_message |