X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=vinstall.sh;h=1afb3b8041ce930552dbb59d3811a6875396f89a;hb=dd235fa1ab3713bcd7d31ff5e5680cbb056244a0;hp=5271a077fb154b082b86c5edbcd7eb3006131ab8;hpb=6c3452882cd76f3294a60974c7fd7cc037d961f3;p=mpd-sima.git

diff --git a/vinstall.sh b/vinstall.sh
index 5271a07..1afb3b8 100755
--- a/vinstall.sh
+++ b/vinstall.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-#   SCRIPT NAME
+#   vinstall.sh
 #
-#   version: 0.0 : Date: 1970/01/01 00:0:00
+#   version: 0.2 : Date: 2013/11/13
 #
 #   TODO:
 #           *
@@ -13,8 +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)}
-MUSICPD="http://media.kaliko.me/src/musicpd/dist/python-musicpd-0.3.1.tar.bz2"
+PY3=${PY3:-$(which python3)}
 
 # Test virtualenv presence
 [ -x "$(which virtualenv)" ] || { echo "Cannot find virtualenv executable!"; exit 1; }
@@ -36,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 $MUSICPD
+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