Fail if destination directory for jekyll new exists and is not empty. Fixes #981.

2013-04-16 18:24:10 +02:00 · 2013-04-16 18:24:10 +02:00 · ba64a9fe30
parent 6ed41e373c
commit ba64a9fe30
1 changed files with 4 additions and 0 deletions
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@ -8,6 +8,10 @@ module Jekyll

        new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
        FileUtils.mkdir_p new_blog_path
+        unless Dir["#{new_blog_path}/**/*"].empty?
+          Jekyll::Logger.error "Conflict:", "#{new_blog_path} exists and is not empty."
+          exit(1)
+        end

        create_sample_files new_blog_path