Fixed distribution scripts

diff --git a/setup.py b/setup.py
index b61594a2c68f6ad89e1ba337df5dbdd4557625b6..cce58f8eecf1716b6a5a9c600351a039a9817c2e 100755 (executable)
--- 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 = [
 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/*')),
     #('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 8d82d52ccc90798b4a933d53a7f3737fc4945423..0988266e37c2f0f84121a781f6d8893b7abe5d68 100644 (file)
--- 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)
             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
 
 # VIM MODLINE
 # vim: ai ts=4 sw=4 sts=4 expandtab

diff --git a/vinstall.sh b/vinstall.sh
index b90dbbb4b06f393304f7430ca7dbf75bdf1fae1a..88d792a72302bd885e5b1951d979e2f884759559 100755 (executable)
--- 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_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
 
 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
 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
 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
 
 rm -rf $(dirname $0)/build
 rm -rf $(dirname $0)/sima.egg-info