Merge tag 'upstream/7.0.1'

Upstream version 7.0.1

1 files changed, 0 insertions, 37 deletions

diff --git a/scripts/nikola b/scripts/nikola
deleted file mode 100755
index 16ac701..0000000
--- a/scripts/nikola
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-
-"""Nikola main script."""
-
-from __future__ import print_function
-import os
-import sys
-
-# LIBDIR trick start (marker for removal on platforms that don't need it)
-libdir = '@LIBDIR@'
-
-# Two cases:
-if libdir != '@' 'LIBDIR' '@':
-    # Changed by our distutils hook, then use the given path.
-
-    if not os.path.isabs(libdir):
-        libdir = os.path.join(os.path.dirname(
-            os.path.realpath(__file__)), libdir)
-        libdir = os.path.abspath(libdir)
-else:
-    # Unchanged, running from checkout,
-    # use the parent directory, the nikola package ought be there.
-    libdir = os.path.join(os.path.dirname(__file__), "..")
-
-sys.path.insert(0, libdir)
-
-if "PYTHONPATH" not in os.environ:
-    os.environ["PYTHONPATH"] = libdir
-else:
-    os.environ["PYTHONPATH"] = os.environ["PYTHONPATH"] + ":" + libdir
-
-# LIBDIR trick end (marker for removal on platforms that don't need it)
-
-from nikola import __main__
-
-if __name__ == "__main__":
-    sys.exit(__main__.main(sys.argv[1:]))