Allow giving root dir to quickstart as an argument.

1 files changed, 12 insertions, 2 deletions

diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index b67ee054c..d79c555d3 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -784,14 +784,24 @@ def inner_main(args):
     if not color_terminal():
         nocolor()
 
+    if len(args) > 3:
+        print 'Usage: sphinx-quickstart [root]'
+        sys.exit(1)
+    elif len(args) == 2:
+        d['path'] = args[1]
+
     print bold('Welcome to the Sphinx %s quickstart utility.') % __version__
     print '''
 Please enter values for the following settings (just press Enter to
 accept a default value, if one is given in brackets).'''
 
-    print '''
+    if 'path' in d:
+        print bold('''
+Selected root path: %s''' % d['path'])
+    else:
+        print '''
 Enter the root path for documentation.'''
-    do_prompt(d, 'path', 'Root path for the documentation', '.', is_path)
+        do_prompt(d, 'path', 'Root path for the documentation', '.', is_path)
 
     while path.isfile(path.join(d['path'], 'conf.py')) or \
           path.isfile(path.join(d['path'], 'source', 'conf.py')):