diff options
| author | Rein Henrichs <reinh@reinh.com> | 2010-04-03 13:34:33 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 98581ad9d70b5c7a5fe65aee7117b6a92dab50fb (patch) | |
| tree | 95398b8bdb13e4e71ad817e116f1fbe1a1e411e7 | |
| parent | b4b07f5be7b3ad506088746da05597cb30fadd14 (diff) | |
| download | puppet-98581ad9d70b5c7a5fe65aee7117b6a92dab50fb.tar.gz puppet-98581ad9d70b5c7a5fe65aee7117b6a92dab50fb.tar.xz puppet-98581ad9d70b5c7a5fe65aee7117b6a92dab50fb.zip | |
Fix builtins glob in single executable
| -rwxr-xr-x | sbin/puppet | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sbin/puppet b/sbin/puppet index d3472cc9d..f22989815 100755 --- a/sbin/puppet +++ b/sbin/puppet @@ -1,7 +1,8 @@ #!/usr/bin/env ruby appdir = File.join('puppet', 'application') -builtins = Dir[File.join(appdir, '*.rb')].map{|fn| File.basename(fn, '.rb')} +absolute_appdir = $:.collect { |x| File.join(x,'puppet','application') }.detect{ |x| File.directory?(x) } +builtins = Dir[File.join(absolute_appdir, '*.rb')].map{|fn| File.basename(fn, '.rb')} usage = "Usage: puppet command <space separated arguments>" available = "Available commands are: #{builtins.sort.join(', ')}" |