diff --git a/script/bench.rb b/script/bench.rb index 6d9394e52a..ce88f408b4 100644 --- a/script/bench.rb +++ b/script/bench.rb @@ -68,10 +68,9 @@ end begin require 'facter' + raise LoadError if Gem::Version.new(Facter.version) < Gem::Version.new("4.0") rescue LoadError run "gem install facter" - # Facter requires CFPropertyList, but doesn't install it. - run "gem install CFPropertyList" puts "please rerun script" exit end @@ -286,7 +285,7 @@ begin # Prevent using external facts because it breaks when running in the # discourse/discourse_bench docker container. - Facter::Util::Config.external_facts_dirs = [] + Facter.reset facts = Facter.to_hash facts.delete_if { |k, v|