Fixed repo_url detection regex
This commit is contained in:
parent
3a2a5d9bf9
commit
ceac2d2d1c
2
Rakefile
2
Rakefile
@ -322,7 +322,7 @@ task :setup_github_pages, :repo do |t, args|
|
|||||||
user = repo_url.match(/github\.com\/([^\/]+)/)[1]
|
user = repo_url.match(/github\.com\/([^\/]+)/)[1]
|
||||||
end
|
end
|
||||||
branch = (repo_url.match(/\/[\w-]+\.github\.(?:io|com)/).nil?) ? 'gh-pages' : 'master'
|
branch = (repo_url.match(/\/[\w-]+\.github\.(?:io|com)/).nil?) ? 'gh-pages' : 'master'
|
||||||
project = (branch == 'gh-pages') ? repo_url.match(/\/([^\.]+)/)[1] : ''
|
project = (branch == 'gh-pages') ? repo_url.match(/([^\/]+?)(\.git|$)/i)[1] : ''
|
||||||
unless (`git remote -v` =~ /origin.+?octopress(?:\.git)?/).nil?
|
unless (`git remote -v` =~ /origin.+?octopress(?:\.git)?/).nil?
|
||||||
# If octopress is still the origin remote (from cloning) rename it to octopress
|
# If octopress is still the origin remote (from cloning) rename it to octopress
|
||||||
system "git remote rename origin octopress"
|
system "git remote rename origin octopress"
|
||||||
|
Loading…
Reference in New Issue
Block a user