From 98581ad9d70b5c7a5fe65aee7117b6a92dab50fb Mon Sep 17 00:00:00 2001
From: Rein Henrichs <reinh@reinh.com>
Date: Sat, 3 Apr 2010 13:34:33 -0700
Subject: Fix builtins glob in single executable

---
 sbin/puppet | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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(', ')}"
-- 
cgit