Merge branch 'master' of github.com:tdreyno/middleman

This commit is contained in:
Thomas Reynolds 2011-08-09 11:08:54 -07:00
commit 6a3a480d13

View file

@ -1,6 +1,6 @@
module Middleman module Middleman
def self.templates_path def self.templates_path
File.join(`cd ~ && pwd`.chomp, ".middleman") File.join(File.expand_path("~/"), ".middleman")
end end
end end
@ -17,4 +17,4 @@ end
Dir[File.join(Middleman.templates_path, "*")].each do |dir| Dir[File.join(Middleman.templates_path, "*")].each do |dir|
next unless File.directory?(dir) next unless File.directory?(dir)
Middleman::Templates.register(File.basename(dir).to_sym, Middleman::Templates::Local) Middleman::Templates.register(File.basename(dir).to_sym, Middleman::Templates::Local)
end end