print correct base url when generating site

awestruct · Sep 13, 2013 · 6f3a592 · 6f3a592
1 parent c0de793
commit 6f3a592
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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()