diff options
| author | Frederic Hemberger <mail@frederic-hemberger.de> | 2011-10-11 14:20:52 +0200 |
|---|---|---|
| committer | Frederic Hemberger <mail@frederic-hemberger.de> | 2011-10-11 14:20:52 +0200 |
| commit | 35ebe0d647dd1775a99ba476f5f26958003c951e (patch) | |
| tree | 7b95a129eee2f263efd4928a75d336c118881d94 | |
| parent | 12c54048d01fb5abb1fec4db495bc20ff2feee4f (diff) | |
| download | my_new_personal_website-35ebe0d647dd1775a99ba476f5f26958003c951e.tar.xz my_new_personal_website-35ebe0d647dd1775a99ba476f5f26958003c951e.zip | |
Allows '-' in deployment branch names, fixes #213
| -rw-r--r-- | Rakefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -283,7 +283,7 @@ desc "Set up _deploy folder and deploy branch for Github Pages deployment" task :setup_github_pages do repo_url = get_stdin("Enter the read/write url for your repository: ") 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? # If octopress is still the origin remote (from cloning) rename it to octopress |