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

When an include cannot be found, only print file path relative to source.

This commit is contained in:
Parker Moore 2014-02-16 22:00:33 -05:00
parent ac8d8a7cb8
commit 264dfc164d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jekyll/tags/include.rb
View File

@ -119,10 +119,14 @@ eos
if safe && !realpath_prefixed_with?(path, dir) if safe && !realpath_prefixed_with?(path, dir)
raise IOError.new "The included file '#{path}' should exist and should not be a symlink" raise IOError.new "The included file '#{path}' should exist and should not be a symlink"
elsif !File.exist?(path) elsif !File.exist?(path)
raise IOError.new "Included file '#{path}' not found" raise IOError.new "Included file '#{path_relative_to_source(dir, path)}' not found"
end end
end end
def path_relative_to_source(dir, path)
File.join(INCLUDES_DIR, path.sub(Regexp.new("^#{dir}"), ""))
end
def realpath_prefixed_with?(path, dir) def realpath_prefixed_with?(path, dir)
File.exist?(path) && File.realpath(path).start_with?(dir) File.exist?(path) && File.realpath(path).start_with?(dir)
end end