Controls file access for config provided path

[mpd-sima.git] / vinstall.sh

diff --git a/vinstall.sh b/vinstall.sh
index a6cb6b44801271196ad62c52be49d80bc32034b3..1afb3b8041ce930552dbb59d3811a6875396f89a 100755 (executable)
--- a/vinstall.sh
+++ b/vinstall.sh
@@ -35,21 +35,28 @@ virtualenv $VENV_OPTIONS $INSTALL_DIR/venv || { echo "something went wrong gener
 PIP_OPTIONS=""
 [ "$DEBUG" = "0" ] && PIP_OPTIONS="$PIP_OPTIONS --quiet"
 
-pip $PIP_OPTIONS install --pre python-musicpd || exit 1
+pip install -e . || 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 "\$@"
+$INSTALL_DIR/$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