Fix provided relative paths to the config filefix_config

We do an expand_path on the passed config value and we use Dir.pwd with the expand, but before we ever get here we change the directory to /, which means specifying a file in the working directory results in something like /client.rb. This isn't what the user wants. Instead change the working directory right before we run the application instead of before we work out the config situation.

Signed-off-by: Tim Smith <tsmith@chef.io>

1 files changed, 4 insertions, 8 deletions

diff --git a/lib/ohai/application.rb b/lib/ohai/application.rb
index dc16d111..2944dc16 100644
--- a/lib/ohai/application.rb
+++ b/lib/ohai/application.rb
@@ -69,14 +69,6 @@ class Ohai::Application
     proc: lambda { |v| puts "Ohai: #{::Ohai::VERSION}" },
     exit: 0
 
-  def initialize
-    super
-
-    # Always switch to a readable directory. Keeps subsequent Dir.chdir() {}
-    # from failing due to permissions when launched as a less privileged user.
-    Dir.chdir("/")
-  end
-
   def run
     elapsed = Benchmark.measure do
       configure_ohai
@@ -95,6 +87,10 @@ class Ohai::Application
   end
 
   def run_application
+    # Always switch to a readable directory. Keeps subsequent Dir.chdir() {}
+    # from failing due to permissions when launched as a less privileged user.
+    Dir.chdir("/")
+
     config[:invoked_from_cli] = true
     config[:logger] = Ohai::Log.with_child
     ohai = Ohai::System.new(config)