From: kaliko <efrim@azylum.org>
Date: Wed, 8 Jan 2014 19:53:30 +0000 (+0100)
Subject: Fixed virtualenv install helper
X-Git-Tag: mpd-sima/0.12.0pr2
X-Git-Url: https://git.kaliko.me/?a=commitdiff_plain;h=24a6e4cbea12edb878c93e525f35887b65c5bf8c;p=mpd-sima.git

Fixed virtualenv install helper
---

diff --git a/INSTALL b/INSTALL
index f93e22f..1ef95d1 100644
--- 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 e6157a2..5cf19d0 100644
--- 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 a6cb6b4..143e885 100755
--- 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