Merge pull request #1328 from sharethrough/master
Use the CNAME from /source when (re)generating _config.yml
This commit is contained in:
commit
b7756c462b
13
Rakefile
13
Rakefile
@ -337,10 +337,8 @@ task :setup_github_pages, :repo do |t, args|
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
url = "http://#{user}.github.io"
|
|
||||||
url += "/#{project}" unless project == ''
|
|
||||||
jekyll_config = IO.read('_config.yml')
|
jekyll_config = IO.read('_config.yml')
|
||||||
jekyll_config.sub!(/^url:.*$/, "url: #{url}")
|
jekyll_config.sub!(/^url:.*$/, "url: #{blog_url(user, project)}")
|
||||||
File.open('_config.yml', 'w') do |f|
|
File.open('_config.yml', 'w') do |f|
|
||||||
f.write jekyll_config
|
f.write jekyll_config
|
||||||
end
|
end
|
||||||
@ -385,6 +383,15 @@ def ask(message, valid_options)
|
|||||||
answer
|
answer
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def blog_url(user, project)
|
||||||
|
url = if File.exists?('source/CNAME')
|
||||||
|
"http://#{IO.read('source/CNAME').strip}"
|
||||||
|
else
|
||||||
|
"http://#{user}.github.io"
|
||||||
|
end
|
||||||
|
url += "/#{project}" unless project == ''
|
||||||
|
end
|
||||||
|
|
||||||
desc "list tasks"
|
desc "list tasks"
|
||||||
task :list do
|
task :list do
|
||||||
puts "Tasks: #{(Rake::Task.tasks - [Rake::Task[:list]]).join(', ')}"
|
puts "Tasks: #{(Rake::Task.tasks - [Rake::Task[:list]]).join(', ')}"
|
||||||
|
Loading…
Reference in New Issue
Block a user