From 2d8874a64fcecb469981441a53e4547049f56f81 Mon Sep 17 00:00:00 2001 From: kaliko Date: Sat, 22 Mar 2014 17:29:18 +0100 Subject: [PATCH] Fixed distribution scripts --- setup.py | 2 +- sima/lib/simafm.py | 1 - vinstall.sh | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index b61594a..cce58f8 100755 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ from sima.info import __version__ as VERSION, __author__ as AUTHOR from sima.info import __doc__ as DESCRIPTION, __email__ as EMAIL data_files = [ - ('share/man/man1', ['data/mpd-sima.1',]), + ('share/man/man1', ['data/man/mpd-sima.1',]), #('share/man/man1', ['data/mpd-sima.1', 'data/simadb_cli.1',]), #('share/man/man5', ['data/mpd-sima.cfg.5',]), ('share/doc/mpd-sima/examples/', glob.glob('doc/examples/*')), diff --git a/sima/lib/simafm.py b/sima/lib/simafm.py index 8d82d52..0988266 100644 --- a/sima/lib/simafm.py +++ b/sima/lib/simafm.py @@ -164,7 +164,6 @@ class SimaFM: song.update(title=song.pop('name')) song.update(time=song.pop('duration')) yield Track(**song) - #return tops # VIM MODLINE # vim: ai ts=4 sw=4 sts=4 expandtab diff --git a/vinstall.sh b/vinstall.sh index b90dbbb..88d792a 100755 --- a/vinstall.sh +++ b/vinstall.sh @@ -35,7 +35,7 @@ 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 @@ -48,12 +48,12 @@ SIMA_VLAUNCHER=$INSTALL_DIR/vmpd-sima cat << EOF > "$SIMA_VLAUNCHER" #!/bin/sh . $INSTALL_DIR/venv/bin/activate -$SIMA_LAUNCHER "\$@" +$INSTALL_DIR/$SIMA_LAUNCHER "\$@" EOF chmod +x $SIMA_VLAUNCHER echo Cleaning up -rm -rf $(dirname $0)/dist +rm -rf $(dirnddame $0)/dist rm -rf $(dirname $0)/build rm -rf $(dirname $0)/sima.egg-info -- 2.39.2