From 5b887fef97fe2fcabe5b7482ca3f9ba62a5eb03e Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Sun, 13 Jan 2013 10:02:54 -0600
Subject: improved regexes for setup_github_pages task

---
 Rakefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Rakefile')

diff --git a/Rakefile b/Rakefile
index 820c5417..471b2277 100644
--- a/Rakefile
+++ b/Rakefile
@@ -308,9 +308,9 @@ task :setup_github_pages, :repo do |t, args|
     repo_url = get_stdin("Repository url: ")
   end
   user = repo_url.match(/:([^\/]+)/)[1]
-  branch = (repo_url.match(/\/[\w-]+.github.com/).nil?) ? 'gh-pages' : 'master'
+  branch = (repo_url.match(/\/[\w-]+\.github\.com/).nil?) ? 'gh-pages' : 'master'
   project = (branch == 'gh-pages') ? repo_url.match(/\/([^\.]+)/)[1] : ''
-  unless `git remote -v`.match(/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
     system "git remote rename origin octopress"
     if branch == 'master'
-- 
cgit v1.2.1