Fetch as much as possible from echonest

[mpd-sima.git] / vinstall.sh

diff --git a/vinstall.sh b/vinstall.sh
index e249ae8db3588c09bdee2ea9af361fdfe70d1cd0..b90dbbb4b06f393304f7430ca7dbf75bdf1fae1a 100755 (executable)
--- a/vinstall.sh
+++ b/vinstall.sh
@@ -13,7 +13,7 @@ DEBUG=${DEBUG:-"0"}     #  Set to 1 in order to enable DEBUG message.
                         ## Only error message will be printed with DEBUG="0"
 
 
-PY3=${PY3:-$(which python3.3)}
+PY3=${PY3:-$(which python3)}
 
 # Test virtualenv presence
 [ -x "$(which virtualenv)" ] || { echo "Cannot find virtualenv executable!"; exit 1; }
@@ -37,19 +37,26 @@ PIP_OPTIONS=""
 
 pip $PIP_OPTIONS install --pre python-musicpd || exit 1
 
+echo Installing mpd-sima
+$(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=$INSTALL_DIR/vmpd-sima
 
-cat << EOF > $SIMA_VLAUNCHER
+cat << EOF > "$SIMA_VLAUNCHER"
 #!/bin/sh
 . $INSTALL_DIR/venv/bin/activate
-python $SIMA_LAUNCHER "\$@"
+$SIMA_LAUNCHER "\$@"
 EOF
 chmod +x $SIMA_VLAUNCHER
 
-echo 
+echo Cleaning up
+rm -rf $(dirname $0)/dist
+rm -rf $(dirname $0)/build
+rm -rf $(dirname $0)/sima.egg-info
+
+echo
 
 # vim: fileencoding=utf8