diff options
author | Jay Mundrawala <jdmundrawala@gmail.com> | 2016-02-16 13:21:39 -0800 |
---|---|---|
committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2016-02-24 21:24:15 -0800 |
commit | 05f5c6727a9dc9f32ef78bafb059f2dd26194724 (patch) | |
tree | 68687ac801b67dbc720d58d6cbd9e84038741f55 | |
parent | 571ad244852b9cd1998af6d67860ff1de5d5e051 (diff) | |
download | chef-05f5c6727a9dc9f32ef78bafb059f2dd26194724.tar.gz |
Refactor workstation_config_loader's conf_d_files
-rw-r--r-- | chef-config/lib/chef-config/workstation_config_loader.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chef-config/lib/chef-config/workstation_config_loader.rb b/chef-config/lib/chef-config/workstation_config_loader.rb index aabfe7235b..63731b729d 100644 --- a/chef-config/lib/chef-config/workstation_config_loader.rb +++ b/chef-config/lib/chef-config/workstation_config_loader.rb @@ -135,13 +135,10 @@ module ChefConfig def conf_d_files @conf_d_files ||= begin - entries = if Config[:conf_d_dir] - Dir.glob(File.join(PathHelper.escape_glob( - Config[:conf_d_dir]), "*.rb")) - else - [] - end - entries.select do |entry| + entries = Array.new + entries << Dir.glob(File.join(PathHelper.escape_glob( + Config[:conf_d_dir]), "*.rb")) if Config[:conf_d_dir] + entries.flatten.select do |entry| File.file?(entry) end end |