From 7457cbae2544b0b85beb118e3ca9b62bcb44d7f1 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 22 Feb 2013 00:59:44 +0100 Subject: [PATCH] Fix issue with watching (auto-regeneration) continuously running if destination is not '_site'. #457. --- lib/jekyll/command.rb | 4 ++-- lib/jekyll/commands/build.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb index f7f0fa6b..bbc9e8a6 100644 --- a/lib/jekyll/command.rb +++ b/lib/jekyll/command.rb @@ -1,9 +1,9 @@ module Jekyll class Command - def self.globs(source) + def self.globs(source, destination) Dir.chdir(source) do dirs = Dir['*'].select { |x| File.directory?(x) } - dirs -= ['_site'] + dirs -= [destination] dirs = dirs.map { |x| "#{x}/**/*" } dirs += ['*'] end diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb index f85b65e7..181316d2 100644 --- a/lib/jekyll/commands/build.rb +++ b/lib/jekyll/commands/build.rb @@ -56,7 +56,7 @@ module Jekyll dw = DirectoryWatcher.new(source) dw.interval = 1 - dw.glob = self.globs(source) + dw.glob = self.globs(source, destination) dw.add_observer do |*args| t = Time.now.strftime("%Y-%m-%d %H:%M:%S")