diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb index d4ad9951..502c4a73 100644 --- a/lib/jekyll/plugin_manager.rb +++ b/lib/jekyll/plugin_manager.rb @@ -76,7 +76,7 @@ module Jekyll # # Returns an Array of plugin search paths def plugins_path - if (site.config['plugins_dir'] == Jekyll::Configuration::DEFAULTS['plugins_dir']) + if site.config['plugins_dir'] == Jekyll::Configuration::DEFAULTS['plugins_dir'] [site.in_source_dir(site.config['plugins_dir'])] else Array(site.config['plugins_dir']).map { |d| File.expand_path(d) } diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb index bb9284aa..20522350 100644 --- a/lib/jekyll/regenerator.rb +++ b/lib/jekyll/regenerator.rb @@ -115,7 +115,7 @@ module Jekyll # # Returns nothing. def add_dependency(path, dependency) - return if (metadata[path].nil? || @disabled) + return if metadata[path].nil? || @disabled unless metadata[path]["deps"].include? dependency metadata[path]["deps"] << dependency diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 1d81e0f0..6b6e8f1c 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -62,7 +62,7 @@ module Jekyll end def value_from_singular_key(hash, key) - hash[key] if (hash.key?(key) || (hash.default_proc && hash[key])) + hash[key] if hash.key?(key) || (hash.default_proc && hash[key]) end def value_from_plural_key(hash, key)