From 8e2f36a607e19683241bdd45894905346c9f9dea Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Thu, 23 Mar 2017 14:56:50 +0100
Subject: [PATCH] setup.py: move cut and cmd inside aubio module, use
 entry_points to generate scripts

---
 python/{scripts/aubio => lib/aubio/cmd.py}    | 2 +-
 python/{scripts/aubiocut => lib/aubio/cut.py} | 2 +-
 setup.py                                      | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)
 rename python/{scripts/aubio => lib/aubio/cmd.py} (99%)
 mode change 100755 => 100644
 rename python/{scripts/aubiocut => lib/aubio/cut.py} (99%)
 mode change 100755 => 100644

diff --git a/python/scripts/aubio b/python/lib/aubio/cmd.py
old mode 100755
new mode 100644
similarity index 99%
rename from python/scripts/aubio
rename to python/lib/aubio/cmd.py
index b1e2ba70..672b845d
--- a/python/scripts/aubio
+++ b/python/lib/aubio/cmd.py
@@ -313,7 +313,7 @@ class process_melbands(default_process):
         fmt_out += ' '.join(["% 9.7f" % f for f in res.tolist()])
         sys.stdout.write(fmt_out + '\n')
 
-if __name__ == '__main__':
+def main():
     parser = aubio_parser()
     args = parser.parse_args()
     if args.show_version or ('verbose' in args and args.verbose > 3):
diff --git a/python/scripts/aubiocut b/python/lib/aubio/cut.py
old mode 100755
new mode 100644
similarity index 99%
rename from python/scripts/aubiocut
rename to python/lib/aubio/cut.py
index e348665c..f8bbef44
--- a/python/scripts/aubiocut
+++ b/python/lib/aubio/cut.py
@@ -140,7 +140,7 @@ def parse_args():
             sys.exit(1)
     return options, args
 
-if __name__ == '__main__':
+def main():
     options, args = parse_args()
 
     hopsize = options.hopsize
diff --git a/setup.py b/setup.py
index 0c93bb97..987ff4cc 100755
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,6 @@ distrib = setup(name='aubio',
     version = __version__,
     packages = ['aubio'],
     package_dir = {'aubio':'python/lib/aubio'},
-    scripts = ['python/scripts/aubiocut', 'python/scripts/aubio'],
     ext_modules = [aubio_extension],
     description = 'a collection of tools for music analysis',
     long_description = 'a collection of tools for music analysis',
@@ -75,6 +74,12 @@ distrib = setup(name='aubio',
         'clean': CleanGenerated,
         'build_ext': build_ext,
         },
+    entry_points = {
+        'console_scripts': [
+            'aubio = aubio.cmd:main',
+            'aubiocut = aubio.cut:main',
+        ],
+    },
     test_suite = 'nose2.collector.collector',
     extras_require = {
         'tests': ['numpy'],
-- 
2.11.0