deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove v1 check

Browse source
This commit is contained in:
Thomas Reynolds 2011-11-23 10:49:33 -08:00
parent 374a82013c
commit a65899672f
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/middleman/cli.rb
View file

@ -62,8 +62,6 @@ module Middleman
:default => false, :default => false,
:desc => 'Print debug messages' :desc => 'Print debug messages'
def server def server
v1_check
params = { params = {
:port => options["port"], :port => options["port"],
:environment => options["environment"], :environment => options["environment"],
@ -91,7 +89,6 @@ module Middleman
:default => nil, :default => nil,
:desc => 'Build a subset of the project' :desc => 'Build a subset of the project'
def build def build
v1_check
thor_group = Middleman::Builder.new([], options).invoke_all thor_group = Middleman::Builder.new([], options).invoke_all
end end
@ -110,13 +107,6 @@ module Middleman
end end
private private
def v1_check
if File.exists?("views") || File.exists?("public")
$stderr.puts "== Error: The views and public folders are have been combined. Use the 'middleman migrate' command to merge your folders automatically."
exit 1
end
end
def help_check def help_check
help self.class.send(:retrieve_task_name, ARGV.dup) help self.class.send(:retrieve_task_name, ARGV.dup)