Merge branch 'master' of https://github.com/enure/jekyll into enure-master

This commit is contained in:
Tom Preston-Werner 2012-12-31 14:22:24 -08:00
commit b36c9788ac
1 changed files with 3 additions and 3 deletions

View File

@ -225,10 +225,10 @@ source = options['source']
destination = options['destination'] destination = options['destination']
# Files to watch # Files to watch
def globs(source) def globs(source, destination)
Dir.chdir(source) do Dir.chdir(source) do
dirs = Dir['*'].select { |x| File.directory?(x) } dirs = Dir['*'].select { |x| File.directory?(x) }
dirs -= ['_site'] dirs -= [destination]
dirs = dirs.map { |x| "#{x}/**/*" } dirs = dirs.map { |x| "#{x}/**/*" }
dirs += ['*'] dirs += ['*']
end end
@ -245,7 +245,7 @@ if options['auto']
dw = DirectoryWatcher.new(source) dw = DirectoryWatcher.new(source)
dw.interval = 1 dw.interval = 1
dw.glob = globs(source) dw.glob = globs(source, destination)
dw.add_observer do |*args| dw.add_observer do |*args|
t = Time.now.strftime("%Y-%m-%d %H:%M:%S") t = Time.now.strftime("%Y-%m-%d %H:%M:%S")