Merge pull request #2 from jezdez/master

Fixed packaging and a minor nit about the stdout option -- Thanks Jannis

3 files changed, 4 insertions, 2 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..8e5e8a9
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,2 @@
+include requirements.txt
+include README.rst
diff --git a/bvg-grabber.py b/bvg-grabber.py
index 318aded..fcaf318 100755
--- a/bvg-grabber.py
+++ b/bvg-grabber.py
@@ -56,10 +56,9 @@ if __name__ == '__main__':
         query = ActualDepartureQueryApi(args.station)
         res = query.call()
 
-    if args.file == 'stdout':
+    if args.file in ('stdout', '-'):
         print(res.to_json, file=sys.stdout)
     else:
         file = open(args.file, 'w')
         print(res.to_json, file=file)
         file.close()
-
diff --git a/setup.py b/setup.py
index 17b642f..3d4d982 100755
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,7 @@ setup(
     include_package_data=True,
     install_requires=requirements,
     test_suite="tests",
+    scripts=['bvg-grabber.py'],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Console',