summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAaron O'Mullan <aaron.omullan@friendco.de>2014-06-16 18:52:36 -0700
committerAaron O'Mullan <aaron.omullan@friendco.de>2014-06-16 18:52:36 -0700
commitd6eb8e4c6042262408c3c0b8d67bccecfa4bf882 (patch)
treec41653fea25bf95c8075da820362bd5b28dc60a9 /lib
parentc87edb155accb043a058f99b42ceb25e7abf7878 (diff)
downloadgitbook-d6eb8e4c6042262408c3c0b8d67bccecfa4bf882.zip
gitbook-d6eb8e4c6042262408c3c0b8d67bccecfa4bf882.tar.gz
gitbook-d6eb8e4c6042262408c3c0b8d67bccecfa4bf882.tar.bz2
Support URLs in "github" config
Fixes GitbookIO/gitbook.io#90
Diffstat (limited to 'lib')
-rw-r--r--lib/generate/index.js11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/generate/index.js b/lib/generate/index.js
index 740f6ba..444f75f 100644
--- a/lib/generate/index.js
+++ b/lib/generate/index.js
@@ -224,8 +224,15 @@ var generateBook = function(options) {
options.github = null;
return null;
} else if(options.github) {
- // Git already specified in options
- return options.github;
+ // Git already specified in options
+ options.github = (
+ // Support URLs in "github" entry of book.json
+ parse.git.githubID(options.github) ||
+
+ // Fallback
+ options.github
+ );
+ return;
}
// Try auto detecting