From 46bdaa49dc8546a54af795f678691dd9c671a70f Mon Sep 17 00:00:00 2001 From: surrim Date: Sat, 5 Mar 2016 23:31:16 +0100 Subject: [PATCH 1/4] using FileUtils.copy_entry instead of FileUtils.cp to allow symlinks --- lib/jekyll/static_file.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb index 0ed0fbfe..4e1f957c 100644 --- a/lib/jekyll/static_file.rb +++ b/lib/jekyll/static_file.rb @@ -80,7 +80,7 @@ module Jekyll FileUtils.mkdir_p(File.dirname(dest_path)) FileUtils.rm(dest_path) if File.exist?(dest_path) - FileUtils.cp(path, dest_path) + FileUtils.copy_entry(path, dest_path) File.utime(@@mtimes[path], @@mtimes[path], dest_path) true From 52eb60e1719b1c386eaca72d9cec8c444072efe8 Mon Sep 17 00:00:00 2001 From: surrim Date: Fri, 11 Mar 2016 18:45:40 +0100 Subject: [PATCH 2/4] use copy_entry only in safe mode --- lib/jekyll/static_file.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb index 4e1f957c..d888aff0 100644 --- a/lib/jekyll/static_file.rb +++ b/lib/jekyll/static_file.rb @@ -80,7 +80,11 @@ module Jekyll FileUtils.mkdir_p(File.dirname(dest_path)) FileUtils.rm(dest_path) if File.exist?(dest_path) - FileUtils.copy_entry(path, dest_path) + if @site.safe || Jekyll.env.start_with?("prod") + FileUtils.cp(path, dest_path) + else + FileUtils.copy_entry(path, dest_path) + end File.utime(@@mtimes[path], @@mtimes[path], dest_path) true From 64d5e3dfd3215540b37878eb1c7f485ce4a65f5f Mon Sep 17 00:00:00 2001 From: surrim Date: Fri, 11 Mar 2016 19:23:37 +0100 Subject: [PATCH 3/4] removed "env=prod"-condition --- lib/jekyll/static_file.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb index d888aff0..33155aea 100644 --- a/lib/jekyll/static_file.rb +++ b/lib/jekyll/static_file.rb @@ -80,7 +80,7 @@ module Jekyll FileUtils.mkdir_p(File.dirname(dest_path)) FileUtils.rm(dest_path) if File.exist?(dest_path) - if @site.safe || Jekyll.env.start_with?("prod") + if @site.safe FileUtils.cp(path, dest_path) else FileUtils.copy_entry(path, dest_path) From 9be387ef6fbb6ce03517c225849fa1811aa208fa Mon Sep 17 00:00:00 2001 From: surrim Date: Fri, 25 Mar 2016 19:42:53 +0100 Subject: [PATCH 4/4] readded "env=prod"-condition --- lib/jekyll/static_file.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb index 33155aea..3e7d0d25 100644 --- a/lib/jekyll/static_file.rb +++ b/lib/jekyll/static_file.rb @@ -80,7 +80,7 @@ module Jekyll FileUtils.mkdir_p(File.dirname(dest_path)) FileUtils.rm(dest_path) if File.exist?(dest_path) - if @site.safe + if @site.safe || Jekyll.env == "production" FileUtils.cp(path, dest_path) else FileUtils.copy_entry(path, dest_path)