Improved documentation

diff --git a/INSTALL b/INSTALL
index ac0b895230999b3001bdd69029ef1d3a5b9ad3fd..36b78649a086f1341d8fc0cf4f985a5bc4a14176 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,23 +1,24 @@
-Design for python >= 3.2
+Design for python3 >= 3.2

 
 Requires: python-musicpd >= 0.4.0 [0],
           requests >= 2.2.0 [1]
 
 
 Requires: python-musicpd >= 0.4.0 [0],
           requests >= 2.2.0 [1]
 

-       [0] http://media.kaliko.me/src/musicpd/
+       [0] http://media.kaliko.me/src/musicpd/releases/

        [1] http://docs.python-requests.org/
 
 
 Virtualenv installation:
 
        [1] http://docs.python-requests.org/
 
 
 Virtualenv installation:
 

-Run "python3 ./vinstall.py" to generate the python virtualenv and install
-requirements (need at least python 3.3).
+With python >= 3.3:
+       Run "python3 ./vinstall.py" to generate the python virtualenv and install
+       requirements (need at least python 3.3).

 
 

-It will setup a virtualenv within a "venv" directory (same level as vinstall.py file).
-It should also write a shell wrapper to run mpd-sima within the virtualenv.
+       It will setup a virtualenv within a "venv" directory (same level as vinstall.py file).
+       It should also write a shell wrapper to run mpd-sima within the virtualenv.

 
 

-       ./vmpd-sima --help
+               ./vmpd-sima --help

 
 

-You might prefer manual installation:
+For pyton < 3.3 and > 3.1 or if you prefer manual installation:

 
        # On your system <virtualenv_command> may be "pyenv", "python3 -m venv" or "virtualenv"
        # Refer to the relevant manual to install a python env, 3.2 minimum.
 
        # On your system <virtualenv_command> may be "pyenv", "python3 -m venv" or "virtualenv"
        # Refer to the relevant manual to install a python env, 3.2 minimum.

diff --git a/setup.py b/setup.py
index c39047d717bc883e19d3571f76fd3eef94c10c93..cf773c7a763fd688939e9c91c59713d3af369ce8 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ setup(name='MPD_sima',
       entry_points={
           'console_scripts': ['mpd-sima = sima.launch:main',]
           },
       entry_points={
           'console_scripts': ['mpd-sima = sima.launch:main',]
           },

-       test_suite="tests",
+      test_suite="tests",

 )
 
 # VIM MODLINE
 )
 
 # VIM MODLINE

diff --git a/vinstall.py b/vinstall.py
old mode 100644 (file)
new mode 100755 (executable)