jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

Browse Source
This commit is contained in:
Stephan Raue 2012-08-01 02:36:49 +02:00
commit 26be834155
7 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/addons/service/web/maraschino/addon
View File

@ -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

4
packages/addons/service/web/maraschino/changelog.txt
View File

@ -1,3 +1,7 @@
2.1.2
- update to maraschino-40e2ce0
- add possibilty to start / stop addon from addon manager with enable / disable
2.1.1
- update to addon version 2.1
- update to maraschino-707e82c

4
packages/addons/service/web/maraschino/meta
View File

@ -19,8 +19,8 @@
################################################################################
PKG_NAME="maraschino"
PKG_VERSION="707e82c"
PKG_REV="1"
PKG_VERSION="40e2ce0"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.maraschinoproject.com/"

3
packages/addons/service/web/maraschino/source/bin/maraschino.service → packages/addons/service/web/maraschino/source/bin/maraschino.start
View File

@ -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 --datadir=$ADDON_HOME

2
packages/addons/service/web/maraschino/source/bin/maraschino.stop Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
kill -9 `ps | grep -E 'python.*/Maraschino.py' | awk '{print $1}'` 2>/dev/null

20
packages/addons/service/web/maraschino/source/default.py
View File

@ -18,6 +18,22 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
import xbmc, time, os, subprocess
import xbmc, time, os, subprocess, xbmcaddon
subprocess.Popen("maraschino.service", shell=True, close_fds=True)
__scriptname__ = "maraschino service"
__author__ = "OpenELEC"
__url__ = "http://www.openelec.tv"
__settings__ = xbmcaddon.Addon(id='service.web.maraschino')
__cwd__ = __settings__.getAddonInfo('path')
__start__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "maraschino.start") )
__stop__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "maraschino.stop") )
#make binary files executable in addon bin folder
subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True)
subprocess.Popen(__start__, shell=True, close_fds=True)
while (not xbmc.abortRequested):
time.sleep(0.250)
subprocess.Popen(__stop__, shell=True, close_fds=True)

2
tools/mkpkg/mkpkg_tvheadend
View File

@ -21,7 +21,7 @@
echo "getting sources..."
if [ ! -d hts-tvheadend.git ]; then
git clone https://github.com/andoma/tvheadend.git hts-tvheadend.git
git clone https://github.com/tvheadend/tvheadend.git hts-tvheadend.git
fi
cd hts-tvheadend.git