deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1117 from bhollis/utf8mac

Browse source 
Fix a perf regression when building
This commit is contained in:
Thomas Reynolds 2013-12-11 10:39:17 -08:00
parent 6db8ba705a 39a9331232
commit fe2f43e8a4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
middleman-core/lib/middleman-core/cli/build.rb
View file

@ -162,6 +162,11 @@ module Middleman::Cli
@to_clean += paths.select do |path| @to_clean += paths.select do |path|
path.to_s !~ /\/\./ || path.to_s =~ /\.(htaccess|htpasswd)/ path.to_s !~ /\/\./ || path.to_s =~ /\.(htaccess|htpasswd)/
end end
if RUBY_PLATFORM =~ /darwin/
# handle UTF-8-MAC filename on MacOS
@to_clean.map { |path| path.to_s.encode('UTF-8', 'UTF-8-MAC') }
end
end end
# Actually build the app # Actually build the app
@ -206,12 +211,7 @@ module Middleman::Cli
output_path = render_to_file(resource) output_path = render_to_file(resource)
if should_clean? && output_path.exist? if should_clean? && output_path.exist?
if RUBY_PLATFORM =~ /darwin/ @to_clean.delete(output_path.realpath)
# handle UTF-8-MAC filename on MacOS
@to_clean.delete_if { |path| path.to_s.encode('UTF-8', 'UTF-8-MAC') == output_path.realpath.to_s }
else
@to_clean.delete(output_path.realpath)
end
end end
end end