From 6f3a59257ea34100e9779c2c9d47436d222a7987 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Fri, 13 Sep 2013 00:14:52 -0600 Subject: [PATCH] print correct base url when generating site --- lib/awestruct/cli/generate.rb | 4 ++-- lib/awestruct/cli/invoker.rb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/awestruct/cli/generate.rb b/lib/awestruct/cli/generate.rb index 057b2930..a32baa9d 100644 --- a/lib/awestruct/cli/generate.rb +++ b/lib/awestruct/cli/generate.rb @@ -15,9 +15,9 @@ def initialize(config, profile=nil, base_url=nil, default_base_url=Options::DEFA def run() begin - base_url = @profile['base_url'] || @default_base_url + base_url = @base_url || @default_base_url $LOG.info "Generating site: #{base_url}" if $LOG.info? - @engine.run( @profile, @base_url, ( @profile ? @profile['base_url'] || @default_base_url : @default_base_url ), @force ) + @engine.run( @profile, @base_url, @default_base_url, @force ) rescue =>e $LOG.error e if $LOG.error? $LOG.error e.backtrace.join("\n") if $LOG.error? diff --git a/lib/awestruct/cli/invoker.rb b/lib/awestruct/cli/invoker.rb index b14debd5..3816a1ab 100644 --- a/lib/awestruct/cli/invoker.rb +++ b/lib/awestruct/cli/invoker.rb @@ -100,7 +100,8 @@ def invoke_force() end def invoke_generate() - @success = Awestruct::CLI::Generate.new( config, options.profile, options.base_url, Options::DEFAULT_BASE_URL, options.force ).run + base_url = profile['base_url'] || options.base_url + @success = Awestruct::CLI::Generate.new( config, options.profile, base_url, Options::DEFAULT_BASE_URL, options.force ).run end def invoke_deploy()