From cf897e1e9e2907872703e184ede303d4e45b261f Mon Sep 17 00:00:00 2001 From: moe Date: Sat, 14 Jul 2012 14:46:46 +0200 Subject: [PATCH] Use plain Dir.chdir instead of enclosing middleman in a Dir.chdir-block. This allows extensions, templates and monkey-patches to chdir when needed, without triggering this ruby warning: warning: conflicting chdir during another chdir block --- middleman-core/bin/middleman | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/middleman-core/bin/middleman b/middleman-core/bin/middleman index 440bbbb8..5b67ff9f 100755 --- a/middleman-core/bin/middleman +++ b/middleman-core/bin/middleman @@ -63,9 +63,8 @@ end # Start the CLI if ENV["MM_ROOT"] # Change directory to the root - Dir.chdir(ENV["MM_ROOT"]) do - Middleman::Cli::Base.start - end + Dir.chdir(ENV["MM_ROOT"]) + Middleman::Cli::Base.start else Middleman::Cli::Base.start -end \ No newline at end of file +end