Uncomment console_scripts in setup, make new start script for portable mode;

adjust tox and travis configuration.

.travis.yml

@@ -18,5 +18,5 @@ install:
   - export PYTHONWARNINGS=all
 script:
   - python checkdeps.py
-  - xvfb-run src/bitmessagemain.py -t
+  - python -m pybitmessage.bitmessagemain -t
   - python -bm tests

setup.py

@@ -3,7 +3,6 @@
 import os
 import platform
 import shutil
-import sys
 
 from setuptools import setup, Extension
 from setuptools.command.install import install
@@ -166,9 +165,9 @@ if __name__ == "__main__":
             ],
             'console_scripts': [
                 'pybitmessage = pybitmessage.bitmessagemain:main'
-            ] if sys.platform[:3] == 'win' else []
+            ]
         },
-        scripts=['src/pybitmessage'],
+        # scripts=['src/pybitmessage'],
         cmdclass={'install': InstallCmd},
         command_options={
             'build_sphinx': {

src/pybitmessage

@@ -1,11 +0,0 @@
-#!/usr/bin/python2.7
-
-import os
-import pkg_resources
-
-dist = pkg_resources.get_distribution('pybitmessage')
-script_file = os.path.join(dist.location, dist.key, 'bitmessagemain.py')
-new_globals = globals()
-new_globals.update(__file__=script_file)
-
-execfile(script_file, new_globals)

start.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+python -m pybitmessage.bitmessagemain "$@"

tox.ini

@@ -9,7 +9,7 @@ setenv =
 deps = -rrequirements.txt
 commands =
     python checkdeps.py
-    coverage run -a src/bitmessagemain.py -t
+    coverage run -a -m pybitmessage.bitmessagemain -t
     coverage run -a -m tests
 
 [testenv:reset]