diff --git a/packages/addons/service/web/maraschino/addon b/packages/addons/service/web/maraschino/addon index cae99c9b35..a1c4b96d4f 100755 --- a/packages/addons/service/web/maraschino/addon +++ b/packages/addons/service/web/maraschino/addon @@ -24,8 +24,3 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/ - cp -PR $ADDON_BUILD/$PKG_ADDON_ID/settings_example.py $ADDON_BUILD/$PKG_ADDON_ID/settings.py - sed 's/\/path\/to\/maraschino.db/\/storage\/.xbmc\/userdata\/addon_data\/service.web.maraschino\/maraschino.db/' -i $ADDON_BUILD/$PKG_ADDON_ID/settings.py - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib - cp -R $BUILD/CherryPy*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib \ No newline at end of file diff --git a/packages/addons/service/web/maraschino/meta b/packages/addons/service/web/maraschino/meta index e7e8e1d6f6..079fe9f755 100644 --- a/packages/addons/service/web/maraschino/meta +++ b/packages/addons/service/web/maraschino/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="maraschino" -PKG_VERSION="707e82c" +PKG_VERSION="40e2ce0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.service b/packages/addons/service/web/maraschino/source/bin/maraschino.service index 30054c8099..639c65b6e5 100755 --- a/packages/addons/service/web/maraschino/source/bin/maraschino.service +++ b/packages/addons/service/web/maraschino/source/bin/maraschino.service @@ -24,9 +24,8 @@ ADDON_DIR="$HOME/.xbmc/addons/service.web.maraschino" ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.web.maraschino" - export PYTHONPATH="$PYTHONPATH:$ADDON_DIR/pylib" ################################################################################ # start maraschino ################################################################################ - python $ADDON_DIR/maraschino-cherrypy.py -q + python $ADDON_DIR/Maraschino.py --log=$ADDON_HOME/maraschino.log