dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5156 from jekyll/theme-source-fix 

Merge pull request 5156
This commit is contained in:
jekyllbot 2016-08-01 17:27:02 -07:00 committed by GitHub
parent e735e45156 8b69c6f0b5
commit 95e9774100
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/jekyll/theme.rb
View File

@ -10,7 +10,11 @@ module Jekyll
end end
def root def root
@root ||= gemspec.full_gem_path # Must use File.realpath to resolve symlinks created by rbenv
# Otherwise, Jekyll.sanitized path with prepend the unresolved root
@root ||= File.realpath(gemspec.full_gem_path)
rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP
nil
end end
def includes_path def includes_path
@ -34,11 +38,8 @@ module Jekyll
private private
def path_for(folder) def path_for(folder)
resolved_dir = realpath_for(folder) path = realpath_for(folder)
return unless resolved_dir path if path && File.directory?(path)
path = Jekyll.sanitized_path(root, resolved_dir)
path if File.directory?(path)
end end
def realpath_for(folder) def realpath_for(folder)