From bc8cf77b7c963d9ba58f1d2d9666554bd158ef89 Mon Sep 17 00:00:00 2001 From: breandan Date: Mon, 28 Dec 2015 12:21:08 -0500 Subject: [PATCH] `FileUtils.cp_r` has inconsistent results on Windows and Linux --- Dockerfile | 2 +- Rakefile | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 90407750039..2cc91490c28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,5 +31,5 @@ WORKDIR /usr/src/app EXPOSE 4000 CMD \ - rake bootstrap && \ + rake bootstrap --trace && \ rake preview diff --git a/Rakefile b/Rakefile index ca6f8c46a40..a19422e2cd0 100644 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,11 @@ Rake.add_rakelib 'sdkdocs-template/rakelib' +begin FileUtils.mkdir_p %w( _includes/code_samples ) -FileUtils.cp_r 'code_samples', '_includes', :verbose => true +FileUtils.cp_r 'code_samples', '_includes', :verbose => true, :remove_destination => true +rescue + `yes | cp -rf code_samples _includes` + end CONFIG = { :source_dir => __dir__,