lib/ohai/system.rb in ohai-14.3.0 vs lib/ohai/system.rb in ohai-14.4.0

@@ -174,12 +174,16 @@
     private
 
     def configure_ohai
       Ohai.config.merge!(@config)
 
-      if Ohai.config[:directory] &&
-          !Ohai.config[:plugin_path].include?(Ohai.config[:directory])
-        Ohai.config[:plugin_path] << Ohai.config[:directory]
+      # add any additional CLI passed directories to the plugin path excluding duplicates
+      unless Ohai.config[:directory].nil?
+        # make sure the directory config is an array since it could be a string set in client.rb
+        Array(Ohai.config[:directory]).each do |dir|
+          next if Ohai.config[:plugin_path].include?(dir)
+          Ohai.config[:plugin_path] << dir
+        end
       end
 
       logger.debug("Running Ohai with the following configuration: #{Ohai.config.configuration}")
     end