Fixed installation process to use entry_points.console_scripts to mak…

…e scripts accessible in a cross-platform way

MANIFEST.in

@@ -1,5 +1,4 @@
 include *.md
 recursive-include tutorials *
-recursive-include scripts *
 recursive-include mtools *.py
 recursive-include mtools/data *

mtools/mgenerate/mgenerate.py

@@ -191,7 +191,9 @@ def run(self, arguments=None):
             p.join()
 
 
-
-if __name__ == '__main__':
+def main():
     tool = MGeneratorTool()
     tool.run()
+
+if __name__ == '__main__':
+    sys.exit(main())

mtools/mlaunch/mlaunch.py

@@ -1227,8 +1227,9 @@ def _construct_mongos(self, logpath, port, configdb):
         self.startup_info[str(port)] = command_str
 
 
-
-
-if __name__ == '__main__':
+def main():
     tool = MLaunchTool()
     tool.run()
+
+if __name__ == '__main__':
+    sys.exit(main())

mtools/mlog2json/mlog2json.py

@@ -1,3 +1,7 @@
 #!/usr/bin/env python
 
-print "deprecated since version 1.1.0 of mtools. Use 'mlogfilter <logfile> --json' instead."
+def main():
+    print "deprecated since version 1.1.0 of mtools. Use 'mlogfilter <logfile> --json' instead."
+
+if __name__ == '__main__':
+    sys.exit(main())

mtools/mlogdistinct/mlogdistinct.py

@@ -1,3 +1,7 @@
 #!/usr/bin/env python
 
-print "deprecated since version 1.1.0 of mtools. Use 'mloginfo <logfile> --distinct' instead."
+def main():
+    print "deprecated since version 1.1.0 of mtools. Use 'mloginfo <logfile> --distinct' instead."
+
+if __name__ == '__main__':
+    sys.exit(main())

mtools/mlogfilter/mlogfilter.py

@@ -282,7 +282,9 @@ def run(self, arguments=None):
                         break
 
 
-if __name__ == '__main__':
-
+def main():
     tool = MLogFilterTool()
     tool.run()
+
+if __name__ == '__main__':
+    sys.exit(main())

mtools/mloginfo/mloginfo.py

@@ -64,6 +64,9 @@ def run(self, arguments=None):
                     section.run()
 
 
-if __name__ == '__main__':
+def main():
     tool = MLogInfoTool()
     tool.run()
+
+if __name__ == '__main__':
+    sys.exit(main())

mtools/mlogmerge/mlogmerge.py

@@ -1,3 +1,7 @@
 #!/usr/bin/env python
 
-print "deprecated since version 1.1.0 of mtools. Use 'mlogfilter <logfile> <logfile> ...' instead."
+def main():
+    print "deprecated since version 1.1.0 of mtools. Use 'mlogfilter <logfile> <logfile> ...' instead.
+
+if __name__ == '__main__':
+    sys.exit(main())"

mtools/mlogversion/mlogversion.py

@@ -1,3 +1,7 @@
 #!/usr/bin/env python
 
-print "deprecated since version 1.1.0 of mtools. Use 'mloginfo <logfile>' instead."
+def main():
+    print "deprecated since version 1.1.0 of mtools. Use 'mloginfo <logfile>' instead."
+
+if __name__ == '__main__':
+    sys.exit(main())"

mtools/mlogvis/mlogvis.py

@@ -84,7 +84,9 @@ def run(self, arguments=None):
 
         webbrowser.open("file://"+dstfilelocation)
 
-
-if __name__ == '__main__':
+def main():
     tool = MLogVisTool()
     tool.run()
+
+if __name__ == '__main__':
+    sys.exit(main())

mtools/mplotqueries/mplotqueries.py

@@ -426,8 +426,9 @@ def plot(self):
         plt.show()
 
 
-if __name__ == '__main__':
+def main():
     tool = MPlotQueriesTool()
     tool.run()
 
-
+if __name__ == '__main__':
+    sys.exit(main())

setup.py

@@ -62,7 +62,6 @@
 with open('README.md') as f:
     long_description = f.read()
 
-
 if sys.platform == 'darwin' and 'clang' in platform.python_compiler().lower():
     from distutils.sysconfig import get_config_vars
     res = get_config_vars()
@@ -79,8 +78,20 @@
     package_data = {
         'mtools': ['data/log2code.pickle', 'data/index.html'],
     },
-    scripts=['scripts/mlaunch', 'scripts/mlogfilter', 'scripts/mlogvis', 'scripts/mplotqueries', 'scripts/mloginfo', \
-             'scripts/mlogversion', 'scripts/mlogmerge', 'scripts/mlog2json', 'scripts/mlogdistinct', 'scripts/mgenerate'],
+    entry_points={
+        "console_scripts": [
+            "mgenerate=mtools.mgenerate.mgenerate:main",
+            "mlaunch=mtools.mlaunch.mlaunch:main",
+            "mlog2json=mtools.mlog2json.mlog2json:main",
+            "mlogdistinct=mtools.mlogdistinct.mlogdistinct:main",
+            "mlogfilter=mtools.mlogfilter.mlogfilter:main",
+            "mloginfo=mtools.mloginfo.mloginfo:main",
+            "mlogmerge=mtools.mlogmerge.mlogmerge:main",
+            "mlogversion=mtools.mlogversion.mlogversion:main",
+            "mlogvis=mtools.mlogvis.mlogvis:main",
+            "mplotqueries=mtools.mplotqueries.mplotqueries:main"
+        ],
+    },
     author='Thomas Rueckstiess',
     author_email='[email protected]',
     url='https://github.com/rueckstiess/mtools',