Merge pull request #916 from AlexanderEkdahl/directory_pre_load

Preloads directory_watcher glob
This commit is contained in:
Parker Moore 2013-04-03 09:52:36 -07:00
commit 5f7b9b8504
1 changed files with 2 additions and 7 deletions

View File

@ -4,11 +4,8 @@ module Jekyll
def self.process(options) def self.process(options)
site = Jekyll::Site.new(options) site = Jekyll::Site.new(options)
if options['watch']
self.watch(site, options)
else
self.build(site, options) self.build(site, options)
end self.watch(site, options) if options['watch']
end end
# Private: Build the site from source into destination. # Private: Build the site from source into destination.
@ -47,8 +44,6 @@ module Jekyll
source = options['source'] source = options['source']
destination = options['destination'] destination = options['destination']
puts " Source: #{source}"
puts " Destination: #{destination}"
puts " Auto-regeneration: enabled" puts " Auto-regeneration: enabled"
dw = DirectoryWatcher.new(source, :glob => self.globs(source, destination), :pre_load => true) dw = DirectoryWatcher.new(source, :glob => self.globs(source, destination), :pre_load => true)