diff options
| author | Daniel DeLeo <dan@opscode.com> | 2010-04-24 13:42:11 -0700 |
|---|---|---|
| committer | Daniel DeLeo <dan@opscode.com> | 2010-05-01 10:50:31 -0700 |
| commit | d6d5769656fd8ff00a3f9fb5aee2e1e54648677f (patch) | |
| tree | af91232027f72bd93376ad5aa26da283c21b3594 /chef/bin | |
| parent | 55f3a1be1e8ef45beb1d24f25882d5fefb854a63 (diff) | |
| download | chef-d6d5769656fd8ff00a3f9fb5aee2e1e54648677f.tar.gz | |
no rubygems in lib/ && cleanup from previous commit
Diffstat (limited to 'chef/bin')
| -rwxr-xr-x | chef/bin/chef-client | 4 | ||||
| -rwxr-xr-x | chef/bin/chef-solo | 3 | ||||
| -rwxr-xr-x | chef/bin/knife | 3 | ||||
| -rwxr-xr-x | chef/bin/shef | 7 |
4 files changed, 6 insertions, 11 deletions
diff --git a/chef/bin/chef-client b/chef/bin/chef-client index bd090cc283..bfd5544319 100755 --- a/chef/bin/chef-client +++ b/chef/bin/chef-client @@ -18,9 +18,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -$:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) - require 'rubygems' +$:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) +require 'chef' require 'chef/application/client' Chef::Application::Client.new.run diff --git a/chef/bin/chef-solo b/chef/bin/chef-solo index c5902fe085..69891acb73 100755 --- a/chef/bin/chef-solo +++ b/chef/bin/chef-solo @@ -18,9 +18,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -$:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) - require 'rubygems' +$:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) require 'chef/application/solo' Chef::Application::Solo.new.run diff --git a/chef/bin/knife b/chef/bin/knife index a02c860522..1e2769906c 100755 --- a/chef/bin/knife +++ b/chef/bin/knife @@ -18,9 +18,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))) - require 'rubygems' +$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))) require 'chef/application/knife' Chef::Application::Knife.new.run diff --git a/chef/bin/shef b/chef/bin/shef index 3d215488d6..2240e49067 100755 --- a/chef/bin/shef +++ b/chef/bin/shef @@ -26,11 +26,8 @@ require "irb" require "irb/completion" # TODO::EVIL -begin - require "#{File.dirname(__FILE__)}/../lib/chef" -rescue LoadError - # the bin got moved, e.g., by rubygems -end +$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))) + require "chef/shef" # dirty hack to make IRB initialize shef |