Fixed virtualenv install helper

diff --git a/INSTALL b/INSTALL
index f93e22f2d385497543e918d916aa224a26e4bd6e..1ef95d16ec17ccc35dd51e6373ffa92b505347ca 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -5,8 +5,8 @@ You might specify a python3 interpreter if the binary name defers from python3.3
 
        PY3=/usr/bin/python ./vinstall.sh
 
-It should also write a vlaunch sh wrapper to run sima within the virtualenv.
+It should also write a shell wrapper to run mpd-sima within the virtualenv.
 
-       ./vlaunch --help
+       ./vmpd-sima --help
 
 

diff --git a/mpd-sima b/mpd-sima
index e6157a2713a6bb58d6be6bd3f98756ae2e54fae3..5cf19d03a76588929a5c1d920d77a60107246533 100644 (file)
--- a/mpd-sima
+++ b/mpd-sima
@@ -7,4 +7,3 @@ main()
 
 # VIM MODLINE
 # vim: ai ts=4 sw=4 sts=4 expandtab
-

diff --git a/vinstall.sh b/vinstall.sh
index a6cb6b44801271196ad62c52be49d80bc32034b3..143e8850a3383917fa4409d25682fb83ba99efd2 100755 (executable)
--- a/vinstall.sh
+++ b/vinstall.sh
@@ -37,19 +37,21 @@ PIP_OPTIONS=""
 
 pip $PIP_OPTIONS install --pre python-musicpd || exit 1
 
+echo Installing mpd-siuma
+$(dirname $0)/setup.py --quiet install || exit 1
+
 deactivate
 
-SIMA_LAUNCHER=$(readlink -f $(dirname $0))/launch
-SIMA_VLAUNCHER=$(readlink -f $(dirname $0))/vlaunch
-[ -x "$SIMA_LAUNCHER" ] || { echo "$SIMA_LAUNCHER not available"; exit 1; }
+SIMA_LAUNCHER=mpd-sima
+SIMA_VLAUNCHER=$(readlink -f $(dirname $0))/vmpd-sima
 
 cat << EOF > $SIMA_VLAUNCHER
 #!/bin/sh
 . $INSTALL_DIR/venv/bin/activate
-python $SIMA_LAUNCHER "\$@"
+$SIMA_LAUNCHER "\$@"
 EOF
 chmod +x $SIMA_VLAUNCHER
 
-echo 
+echo
 
 # vim: fileencoding=utf8