mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
This commit is contained in:
Stephan Raue
commit
1bdf8ab97b
@ -20,7 +20,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="CouchPotatoServer"
|
||||
PKG_VERSION="393c14d"
|
||||
PKG_VERSION="811f35b"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
2
packages/3rdparty/download/SABnzbd/meta
vendored
2
packages/3rdparty/download/SABnzbd/meta
vendored
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="SABnzbd"
|
||||
PKG_VERSION="0.7.9"
|
||||
PKG_VERSION="0.7.11"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
2
packages/3rdparty/download/SickBeard/meta
vendored
2
packages/3rdparty/download/SickBeard/meta
vendored
@ -20,7 +20,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="SickBeard"
|
||||
PKG_VERSION="e6dcfb3"
|
||||
PKG_VERSION="6cb5e76"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
3.0.3
|
||||
- update to SABnzbd-0.7.11
|
||||
- update to CouchPotatoServer-811f35b
|
||||
- update to SickBeard-6cb5e76
|
||||
- added option to restart the suite on suspend / resume
|
||||
|
||||
3.0.2
|
||||
- Fixed bug causing configobj to throw an exception with Couchpotato v2s config
|
||||
- corrected a bug causing most of the suite to crash on first launch in certain circumstances
|
||||
|
||||
@ -10,4 +10,5 @@
|
||||
<setting id="COUCHPOTATO_LAUNCH" value="true" />
|
||||
<setting id="COUCHPOTATO_VERSION" value="1" />
|
||||
<setting id="HEADPHONES_LAUNCH" value="true" />
|
||||
<setting id="RESTART_ON_RESUME" value="false" />
|
||||
</settings>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
PKG_NAME="SABnzbd-Suite"
|
||||
PKG_VERSION="3.0"
|
||||
PKG_REV="2"
|
||||
PKG_REV="3"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.openelec.tv"
|
||||
|
||||
@ -17,5 +17,6 @@
|
||||
<string id="3021">Keep awake while downloading</string>
|
||||
<string id="3030">Wake up periodically</string>
|
||||
<string id="3031">Wake up at</string>
|
||||
<string id="3032">Restart on suspend / resume</string>
|
||||
|
||||
</strings>
|
||||
|
||||
@ -24,6 +24,7 @@
|
||||
<setting id="SABNZBD_WAKE_AT" type="enum" subsetting="true" enable="eq(-1,true)"
|
||||
label="3031" default="01"
|
||||
values="|01:00|03:00|05:00|07:00|09:00|11:00|13:00|15:00|17:00|19:00|21:00|23:00"/>
|
||||
<setting id="RESTART_ON_RESUME" type="bool" label="3032" default="false" />
|
||||
|
||||
</category>
|
||||
</settings>
|
||||
|
||||
@ -0,0 +1,51 @@
|
||||
#!/bin/sh
|
||||
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# This Program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This Program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with OpenELEC.tv; see the file COPYING. If not, write to
|
||||
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
. /etc/profile
|
||||
|
||||
ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.SABnzbd-Suite"
|
||||
ADDON_SETTINGS="$ADDON_HOME/settings.xml"
|
||||
RESTART_ON_RESUME=`grep RESTART_ON_RESUME $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
|
||||
|
||||
LOCKFILE="/var/lock/SABnzbd-Suite.sleep"
|
||||
|
||||
if [ "$RESTART_ON_RESUME" == "true" ] ; then
|
||||
case "$1" in
|
||||
hibernate|suspend)
|
||||
if [ ! -z "`ps | grep -E 'python.*service.downloadmanager.SABnzbd-Suite' | awk '{print $1}'`" ] ; then
|
||||
progress "Shutting down SABnzbd-Suite for suspending..."
|
||||
SABnzbd-Suite.stop
|
||||
touch $LOCKFILE
|
||||
fi
|
||||
;;
|
||||
|
||||
thaw|resume)
|
||||
progress "Restarting SABnzbd-Suite for wakeup..."
|
||||
if [ -f "$LOCKFILE" ] ; then
|
||||
rm -rf "$LOCKFILE"
|
||||
python $HOME/.xbmc/addons/service.downloadmanager.SABnzbd-Suite/bin/SABnzbd-Suite.py
|
||||
fi
|
||||
;;
|
||||
*) exit $NA
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@ -1,3 +1,6 @@
|
||||
3.0.6
|
||||
- update to oscam-8334
|
||||
|
||||
3.0.5
|
||||
- update to oscam-8119
|
||||
- use internal crypto functions
|
||||
|
||||
@ -20,8 +20,8 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="oscam"
|
||||
PKG_VERSION="8119"
|
||||
PKG_REV="5"
|
||||
PKG_VERSION="8334"
|
||||
PKG_REV="6"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.streamboard.tv/oscam/wiki"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user