diff options
| author | Brandon Mathis <brandon@imathis.com> | 2013-01-13 10:02:54 -0600 |
|---|---|---|
| committer | Brandon Mathis <brandon@imathis.com> | 2013-01-13 10:02:54 -0600 |
| commit | 5b887fef97fe2fcabe5b7482ca3f9ba62a5eb03e (patch) | |
| tree | 4dd4ff548089c13aaaa7d5f3be43b6c055e91441 | |
| parent | 963eff26eb52e8622559d61ae54db38e7c101bd3 (diff) | |
| download | my_new_personal_website-5b887fef97fe2fcabe5b7482ca3f9ba62a5eb03e.tar.xz my_new_personal_website-5b887fef97fe2fcabe5b7482ca3f9ba62a5eb03e.zip | |
improved regexes for setup_github_pages task
| -rw-r--r-- | Rakefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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' |