From 94fe71288df6b267bd4257ddeb99ebe009ef5860 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Thu, 5 Jul 2018 21:12:25 -0700 Subject: Don't require rubygems in our binaries Rubygems is built in Ruby now. Signed-off-by: Tim Smith --- bin/chef-apply | 1 - bin/chef-client | 3 +-- bin/chef-service-manager | 3 +-- bin/chef-shell | 7 +------ bin/chef-solo | 3 +-- bin/chef-windows-service | 3 +-- bin/knife | 3 +-- 7 files changed, 6 insertions(+), 17 deletions(-) (limited to 'bin') diff --git a/bin/chef-apply b/bin/chef-apply index 39c6682b78..ddbdc66907 100755 --- a/bin/chef-apply +++ b/bin/chef-apply @@ -18,7 +18,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "rubygems" $:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) require "chef/application/apply" diff --git a/bin/chef-client b/bin/chef-client index 207bb8941f..af27d7903d 100755 --- a/bin/chef-client +++ b/bin/chef-client @@ -3,7 +3,7 @@ # ./chef-client - Run the chef client # # Author:: AJ Christensen () -# Copyright:: Copyright 2008-2016, Chef Software Inc. +# Copyright:: Copyright 2008-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,7 +18,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "rubygems" $:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) require "chef" require "chef/application/client" diff --git a/bin/chef-service-manager b/bin/chef-service-manager index bbdfe005df..9021824fed 100755 --- a/bin/chef-service-manager +++ b/bin/chef-service-manager @@ -3,7 +3,7 @@ # ./chef-service-manager - Control chef-service on Windows platforms. # # Author:: Serdar Sutay (serdar@chef.io) -# Copyright:: Copyright 2013-2016, Chef Software Inc. +# Copyright:: Copyright 2013-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,7 +18,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "rubygems" $:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) require "chef" require "chef/application/windows_service_manager" diff --git a/bin/chef-shell b/bin/chef-shell index 9b10aa134b..666ce1944c 100755 --- a/bin/chef-shell +++ b/bin/chef-shell @@ -3,7 +3,7 @@ # ./chef-shell - Run the Chef REPL (Shell) # # Author:: Daniel DeLeo () -# Copyright:: Copyright (c) 2009 +# Copyright:: Copyright 2009-2018 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,11 +18,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -begin - require "rubygems" -rescue LoadError -end - Encoding.default_external = Encoding::UTF_8 require "irb" diff --git a/bin/chef-solo b/bin/chef-solo index 23def86a11..06c0452d26 100755 --- a/bin/chef-solo +++ b/bin/chef-solo @@ -3,7 +3,7 @@ # ./chef-solo - Run the chef client, in stand-alone mode # # Author:: AJ Christensen () -# Copyright:: Copyright 2008-2016, Chef Software Inc. +# Copyright:: Copyright 2008-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,7 +18,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "rubygems" $:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) require "chef/application/solo" diff --git a/bin/chef-windows-service b/bin/chef-windows-service index 184c3d7cd6..646e3b4a93 100755 --- a/bin/chef-windows-service +++ b/bin/chef-windows-service @@ -2,7 +2,7 @@ # # Author:: Jay Mundrawala () # -# Copyright:: 2014, Chef Software, Inc. +# Copyright:: 2014-2018, Chef Software, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,6 @@ # generate will call that file, and will be registered as # a windows service. -require "rubygems" $:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) require "chef" require "chef/application/windows_service" diff --git a/bin/knife b/bin/knife index b8983d6d5c..e93e47d1d4 100755 --- a/bin/knife +++ b/bin/knife @@ -3,7 +3,7 @@ # ./knife - Chef CLI interface # # Author:: Adam Jacob () -# Copyright:: Copyright 2009-2016, Chef Software Inc. +# Copyright:: Copyright 2009-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,7 +18,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "rubygems" $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))) require "chef/application/knife" -- cgit v1.2.1