Update more files that hardcode sys.argv

10 files changed, 13 insertions, 14 deletions

diff --git a/sphinx-apidoc.py b/sphinx-apidoc.py
index 0290d6c50..c9f7b4f48 100755
--- a/sphinx-apidoc.py
+++ b/sphinx-apidoc.py
@@ -12,4 +12,4 @@ import sys
 
 if __name__ == '__main__':
     from sphinx.apidoc import main
-    sys.exit(main(sys.argv))
+    sys.exit(main(sys.argv[1:]))
diff --git a/sphinx-autogen.py b/sphinx-autogen.py
index 8320b2c14..c9a78d158 100755
--- a/sphinx-autogen.py
+++ b/sphinx-autogen.py
@@ -12,4 +12,4 @@ import sys
 
 if __name__ == '__main__':
     from sphinx.ext.autosummary.generate import main
-    sys.exit(main(sys.argv))
+    sys.exit(main(sys.argv[1:]))
diff --git a/sphinx-build.py b/sphinx-build.py
index ae60c0724..e8116fefc 100755
--- a/sphinx-build.py
+++ b/sphinx-build.py
@@ -12,4 +12,4 @@ import sys
 
 if __name__ == '__main__':
     from sphinx import main
-    sys.exit(main(sys.argv))
+    sys.exit(main(sys.argv[1:]))
diff --git a/sphinx-quickstart.py b/sphinx-quickstart.py
index bf8423fa6..7e17beb27 100755
--- a/sphinx-quickstart.py
+++ b/sphinx-quickstart.py
@@ -12,4 +12,4 @@ import sys
 
 if __name__ == '__main__':
     from sphinx.quickstart import main
-    sys.exit(main(sys.argv))
+    sys.exit(main(sys.argv[1:]))
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 07d02c17c..87c295896 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -63,7 +63,7 @@ if __version__.endswith('+'):
         pass
 
 
-def main(argv=sys.argv):
+def main(argv=sys.argv[1:]):
     # type: (List[str]) -> int
     if sys.argv[1:2] == ['-M']:
         return make_main(argv)
@@ -71,7 +71,7 @@ def main(argv=sys.argv):
         return build_main(argv)
 
 
-def build_main(argv=sys.argv):
+def build_main(argv=sys.argv[1:]):
     # type: (List[str]) -> int
     """Sphinx build "main" command-line entry."""
     if (sys.version_info[:3] < (2, 7, 0) or
@@ -113,7 +113,7 @@ def build_main(argv=sys.argv):
     return cmdline.main(argv)  # type: ignore
 
 
-def make_main(argv=sys.argv):
+def make_main(argv=sys.argv[1:]):
     # type: (List[str]) -> int
     """Sphinx build "make mode" entry."""
     from sphinx import make_mode
@@ -121,4 +121,4 @@ def make_main(argv=sys.argv):
 
 
 if __name__ == '__main__':
-    sys.exit(main(sys.argv))
+    sys.exit(main(sys.argv[1:]))
diff --git a/sphinx/__main__.py b/sphinx/__main__.py
index 544505a6c..0022d1b0b 100644
--- a/sphinx/__main__.py
+++ b/sphinx/__main__.py
@@ -11,4 +11,4 @@
 import sys
 from sphinx import main
 
-sys.exit(main(sys.argv))
+sys.exit(main(sys.argv[1:]))
diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index d018603e2..73078330b 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -383,4 +383,4 @@ if __name__ == '__main__':
     import logging  # type: ignore
     logging.basicConfig()
 
-    debug(argv=sys.argv)  # type: ignore
+    debug(argv=sys.argv[1:])  # type: ignore
diff --git a/sphinx/make_mode.py b/sphinx/make_mode.py
index 512dc5be3..e76059131 100644
--- a/sphinx/make_mode.py
+++ b/sphinx/make_mode.py
@@ -302,8 +302,7 @@ class Make(object):
         if doctreedir is None:
             doctreedir = self.builddir_join('doctrees')
 
-        args = [sys.argv[0],
-                '-b', builder,
+        args = ['-b', builder,
                 '-d', doctreedir,
                 self.srcdir,
                 self.builddir_join(builder)]
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index cfa11fc3f..d8cada18d 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -712,4 +712,4 @@ def main(argv=sys.argv[1:]):
 
 
 if __name__ == '__main__':
-    sys.exit(main(sys.argv))
+    sys.exit(main(sys.argv[1:]))
diff --git a/utils/check_sources.py b/utils/check_sources.py
index 3895ee1d6..7e368127c 100755
--- a/utils/check_sources.py
+++ b/utils/check_sources.py
@@ -256,4 +256,4 @@ def main(argv):
 
 
 if __name__ == '__main__':
-    sys.exit(main(sys.argv))
+    sys.exit(main(sys.argv[1:]))