diff --git a/jekyll-multisite.gemspec b/jekyll-multisite.gemspec index 9b03c74..3e52935 100644 --- a/jekyll-multisite.gemspec +++ b/jekyll-multisite.gemspec @@ -11,4 +11,5 @@ Gem::Specification.new do |s| s.license = 'GPL-3.0' s.files = ['lib/jekyll-multisite.rb'] s.add_runtime_dependency 'jekyll', '~> 3.0', '>= 3.0.1' + s.add_runtime_dependency 'jekyll-paginate', '~> 1.1.0' end diff --git a/lib/jekyll-multisite.rb b/lib/jekyll-multisite.rb index 943fea1..c4daa21 100644 --- a/lib/jekyll-multisite.rb +++ b/lib/jekyll-multisite.rb @@ -34,7 +34,9 @@ def sanitized_path(base_directory, questionable_path) base_directory elsif questionable_path.start_with?(base_directory) questionable_path - elsif File.exists?(questionable_path) and questionable_path != '/' + elsif File.exists?(questionable_path) and !questionable_path.start_with?('/') and (ENV['OS'] == 'Windows_NT') + File.expand_path(questionable_path) + elsif File.exists?(questionable_path) and questionable_path != '/' and !(ENV['OS'] == 'Windows_NT') File.expand_path(questionable_path) else File.join(base_directory, questionable_path) @@ -46,7 +48,7 @@ def sanitized_path(base_directory, questionable_path) class Cleaner def parent_dirs(file) parent_dir = File.dirname(file) - if parent_dir == '/' + if parent_dir == '/' or File.dirname(parent_dir) == parent_dir or !parent_dir.start_with?(site.dest) [] elsif parent_dir == site.dest []