From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Mon, 28 Oct 2013 06:08:59 +0000 (-0700)
Subject: Merge pull request #1620 from jaimeMF/console_script
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=db477d3a37cbe5df5fd9151d557db33d8534e9f2;hp=-c

Merge pull request #1620 from jaimeMF/console_script

Use the console_scripts entry point if setuptools is available
---

db477d3a37cbe5df5fd9151d557db33d8534e9f2
diff --combined setup.py
index 2391c5272,347a4f2d8..f14f96377
--- a/setup.py
+++ b/setup.py
@@@ -8,6 -8,7 +8,7 @@@ import sy
  
  try:
      from setuptools import setup
+     setuptools_available = True
  except ImportError:
      from distutils.core import setup
  
@@@ -43,13 -44,16 +44,16 @@@ if len(sys.argv) >= 2 and sys.argv[1] =
      params = py2exe_params
  else:
      params = {
-         'scripts': ['bin/youtube-dl'],
          'data_files': [  # Installing system-wide would require sudo...
              ('etc/bash_completion.d', ['youtube-dl.bash-completion']),
              ('share/doc/youtube_dl', ['README.txt']),
              ('share/man/man1/', ['youtube-dl.1'])
          ]
      }
+     if setuptools_available:
+         params['entry_points'] = {'console_scripts': ['youtube-dl = youtube_dl:main']}
+     else:
+         params['scripts'] = ['bin/youtube-dl']
  
  # Get the version from youtube_dl/version.py without importing the package
  exec(compile(open('youtube_dl/version.py').read(),
@@@ -63,7 -67,6 +67,7 @@@ setup
      ' YouTube.com and other video sites.',
      url='https://github.com/rg3/youtube-dl',
      author='Ricardo Garcia',
 +    author_email='ytdl@yt-dl.org',
      maintainer='Philipp Hagemeister',
      maintainer_email='phihag@phihag.de',
      packages=['youtube_dl', 'youtube_dl.extractor'],