diff --git a/packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-393c14d-move-cache.patch b/packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-393c14d-move-cache.patch new file mode 100644 index 0000000000..80953fb67f --- /dev/null +++ b/packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-393c14d-move-cache.patch @@ -0,0 +1,13 @@ +diff --git a/couchpotato/runner.py b/couchpotato/runner.py +index c0b7eb8..3a550f9 100644 +--- a/couchpotato/runner.py ++++ b/couchpotato/runner.py +@@ -112,7 +112,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En + Env.set('data_dir', data_dir) + Env.set('log_path', os.path.join(log_dir, 'CouchPotato.log')) + Env.set('db_path', 'sqlite:///' + db_path) +- Env.set('cache_dir', os.path.join(data_dir, 'cache')) ++ Env.set('cache_dir', os.path.join(data_dir, 'cache.cpv2')) + Env.set('cache', FileSystemCache(os.path.join(Env.get('cache_dir'), 'python'))) + Env.set('console_log', options.console_log) + Env.set('quiet', options.quiet) diff --git a/packages/addons/debugging/tools/htop/changelog.txt b/packages/addons/debugging/tools/htop/changelog.txt index 4b6bc126b5..07a22e4b4f 100644 --- a/packages/addons/debugging/tools/htop/changelog.txt +++ b/packages/addons/debugging/tools/htop/changelog.txt @@ -1,3 +1,6 @@ +3.0.2 +- update to htop-1.0.2 + 3.0.1 - bump addon version diff --git a/packages/addons/debugging/tools/htop/meta b/packages/addons/debugging/tools/htop/meta index 725914772f..c60d0fba69 100644 --- a/packages/addons/debugging/tools/htop/meta +++ b/packages/addons/debugging/tools/htop/meta @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="htop" -PKG_VERSION="1.0.1" -PKG_REV="1" +PKG_VERSION="1.0.2" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://htop.sourceforge.net/" diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt index d091ae8a5f..b118d25df0 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt @@ -1,4 +1,6 @@ 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 - update to SABnzbd-0.7.9 - update to CouchPotatoServer-393c14d - update to Headphones-263272c diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml index fd3d452b30..74e7b9ba84 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml @@ -8,6 +8,6 @@ - + diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py index 748a8c54f6..a52f9f8531 100755 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py @@ -74,6 +74,7 @@ pSickBeardSettings = os.path.join(pAddonHome, 'sickbeard.ini') pCouchPotatoSettings = os.path.join(pAddonHome, 'couchpotato.ini') pCouchPotatoServerSettings = os.path.join(pAddonHome, 'couchpotatoserver.ini') pHeadphonesSettings = os.path.join(pAddonHome, 'headphones.ini') +pTransmission_Addon_Settings ='/storage/.xbmc/userdata/addon_data/service.downloadmanager.transmission/settings.xml' # directories pSabNzbdComplete = '/storage/downloads' @@ -130,6 +131,18 @@ if firstLaunch: # read addon and xbmc settings # ---------------------------- +# Transmission-Daemon +if os.path.exists(pTransmission_Addon_Settings): + fTransmission_Addon_Settings = open(pTransmission_Addon_Settings, 'r') + data = fTransmission_Addon_Settings.read() + fTransmission_Addon_Settings.close + transmission_addon_settings = parseString(data) + transuser = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_USER') + transpwd = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_PWD') + transauth = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_AUTH') +else: + transauth = 'false' + # SABnzbd-Suite fSuiteSettings = open(pSuiteSettings, 'r') data = fSuiteSettings.read() @@ -249,7 +262,7 @@ try: # launch SABnzbd and get the API key # ---------------------------------- - if "true" in sabnzbd_launch: + if firstLaunch or "true" in sabnzbd_launch: logging.debug('Launching SABnzbd...') subprocess.call(sabnzbd,close_fds=True) logging.debug('...done') @@ -260,6 +273,8 @@ try: sabNzbdConfig.reload() sabNzbdApiKey = sabNzbdConfig['misc']['api_key'] logging.debug('SABnzbd api key: ' + sabNzbdApiKey) + if firstLaunch and "false" in sabnzbd_launch: + urllib2.urlopen('http://' + sabNzbdHost + '/api?mode=shutdown&apikey=' + sabNzbdApiKey) except Exception,e: print 'SABnzbd: exception occurred:', e print traceback.format_exc() @@ -308,6 +323,7 @@ try: defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost defaultConfig['XBMC']['xbmc_notify_ondownload'] = '1' defaultConfig['XBMC']['xbmc_update_library'] = '1' + defaultConfig['XBMC']['xbmc_update_full'] = '1' sickBeardConfig.merge(defaultConfig) sickBeardConfig.write() @@ -383,10 +399,8 @@ try: # write CouchPotatoServer settings # -------------------------- - couchPotatoServerConfig = ConfigObj(pCouchPotatoServerSettings,create_empty=True) + couchPotatoServerConfig = ConfigObj(pCouchPotatoServerSettings,create_empty=True, list_values=False) defaultConfig = ConfigObj() - defaultConfig['newznab'] = {} - defaultConfig['newznab']['api_key'] = '' defaultConfig['core'] = {} defaultConfig['core']['username'] = user defaultConfig['core']['password'] = md5pwd @@ -415,15 +429,26 @@ try: defaultConfig['xbmc']['username'] = xbmcUser defaultConfig['xbmc']['password'] = xbmcPwd + if 'true' in transauth: + defaultConfig['transmission'] = {} + defaultConfig['transmission']['username'] = transuser + defaultConfig['transmission']['password'] = transpwd + defaultConfig['transmission']['directory'] = pSabNzbdCompleteMov + defaultConfig['transmission']['host'] = 'localhost:9091' + if firstLaunch: + defaultConfig['xbmc']['xbmc_update_library'] = '1' + defaultConfig['xbmc']['xbmc_update_full'] = '1' + defaultConfig['xbmc']['xbmc_notify_onsnatch'] = '1' + defaultConfig['xbmc']['xbmc_notify_ondownload'] = '1' defaultConfig['Sabnzbd']['category'] = 'movies' defaultConfig['Sabnzbd']['pp_directory'] = pSabNzbdCompleteMov defaultConfig['Renamer'] = {} - defaultConfig['Renamer']['enabled'] = 'True' + defaultConfig['Renamer']['enabled'] = '1' defaultConfig['Renamer']['download'] = pSabNzbdCompleteMov defaultConfig['Renamer']['destination'] = '/storage/videos' defaultConfig['Renamer']['separator'] = '.' - defaultConfig['Renamer']['cleanup'] = 'False' + defaultConfig['Renamer']['cleanup'] = '0' couchPotatoServerConfig.merge(defaultConfig) couchPotatoServerConfig.write() @@ -446,13 +471,23 @@ try: headphonesConfig = ConfigObj(pHeadphonesSettings,create_empty=True) defaultConfig = ConfigObj() defaultConfig['General'] = {} - defaultConfig['General']['launch_browser'] = '0' - defaultConfig['General']['http_port'] = '8084' - defaultConfig['General']['http_host'] = host - defaultConfig['General']['http_username'] = user - defaultConfig['General']['http_password'] = pwd + defaultConfig['General']['launch_browser'] = '0' + defaultConfig['General']['http_port'] = '8084' + defaultConfig['General']['http_host'] = host + defaultConfig['General']['http_username'] = user + defaultConfig['General']['http_password'] = pwd + defaultConfig['General']['check_github'] = '0' + defaultConfig['General']['check_github_on_startup'] = '0' + defaultConfig['General']['log_dir'] = pAddonHome + '/logs' + defaultConfig['General']['folder_permissions'] = '0644' + defaultConfig['XBMC'] = {} + defaultConfig['XBMC']['xbmc_enabled'] = '1' + defaultConfig['XBMC']['xbmc_host'] = '127.0.0.1:' + xbmcPort + defaultConfig['XBMC']['xbmc_username'] = xbmcUser + defaultConfig['XBMC']['xbmc_password'] = xbmcPwd + defaultConfig['SABnzbd'] = {} + if "true" in sabnzbd_launch: - defaultConfig['SABnzbd'] = {} defaultConfig['SABnzbd']['sab_apikey'] = sabNzbdApiKey defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost defaultConfig['SABnzbd']['sab_username'] = user @@ -460,6 +495,8 @@ try: if firstLaunch: defaultConfig['SABnzbd']['sab_category'] = 'music' + defaultConfig['XBMC']['xbmc_update'] = '1' + defaultConfig['XBMC']['xbmc_notify'] = '1' defaultConfig['General']['music_dir'] = '/storage/music' defaultConfig['General']['destination_dir'] = '/storage/music' defaultConfig['General']['download_dir'] = '/storage/downloads/music' diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop index 9e0ed19de7..f240d07576 100755 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop @@ -1,6 +1,2 @@ #!/bin/sh -kill -9 `ps | grep -E 'python.*/SABnzbd-Suite.py' | awk '{print $1}'` 2>/dev/null -kill -9 `ps | grep -E 'python.*/SABnzbd.py' | awk '{print $1}'` 2>/dev/null -kill -9 `ps | grep -E 'python.*/SickBeard.py' | awk '{print $1}'` 2>/dev/null -kill -9 `ps | grep -E 'python.*/CouchPotato.py' | awk '{print $1}'` 2>/dev/null -kill -9 `ps | grep -E 'python.*/Headphones.py' | awk '{print $1}'` 2>/dev/null +kill `ps | grep -E 'python.*service.downloadmanager.SABnzbd-Suite' | awk '{print $1}'` 2>/dev/null diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml index b41c86dd36..e996371150 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml @@ -10,7 +10,7 @@ - + diff --git a/packages/sysutils/bash/profile.d/path.conf b/packages/sysutils/bash/profile.d/path.conf index 38a1386090..afbebc3dc5 100644 --- a/packages/sysutils/bash/profile.d/path.conf +++ b/packages/sysutils/bash/profile.d/path.conf @@ -26,12 +26,16 @@ PATH="/bin:/sbin:/usr/bin:/usr/sbin" # hack: add addons to $PATH - for addons in `find /storage/.xbmc/addons/* -name bin -type d`; do - PATH="$PATH:$addons" + for addon in /storage/.xbmc/addons/*/bin; do + if [ -d "$addon" ] ; then + PATH="$PATH:$addon" + fi done - for sys in `find /usr/lib/xbmc/addons/* -name bin -type d`; do - PATH="$PATH:$sys" + for sys in /usr/lib/xbmc/addons/*/bin; do + if [ -d "$sys" ] ; then + PATH="$PATH:$sys" + fi done export PATH diff --git a/packages/sysutils/busybox/config/profile b/packages/sysutils/busybox/config/profile index ee89d870c0..2854429f27 100644 --- a/packages/sysutils/busybox/config/profile +++ b/packages/sysutils/busybox/config/profile @@ -60,6 +60,8 @@ } # read config files - for config in `ls /etc/profile.d/`; do - . /etc/profile.d/$config + for config in /etc/profile.d/*; do + if [ -f "$config" ] ; then + . $config + fi done diff --git a/packages/sysutils/busybox/profile.d/librarypath.conf b/packages/sysutils/busybox/profile.d/librarypath.conf index 28b5ae89b1..cbecaa784d 100644 --- a/packages/sysutils/busybox/profile.d/librarypath.conf +++ b/packages/sysutils/busybox/profile.d/librarypath.conf @@ -28,12 +28,16 @@ LD_LIBRARY_PATH="/usr/lib:/lib" # hack: add addons to $LD_LIBRARY_PATH - for addons in `find /storage/.xbmc/addons/* -name lib -type d`; do - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addons" + for addon in /storage/.xbmc/addons/*/lib; do + if [ -d "$addon" ] ; then + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addon" + fi done - for sys in `find /usr/lib/xbmc/addons/* -name lib -type d`; do - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$sys" + for sys in /usr/lib/xbmc/addons/*/lib; do + if [ -d "$sys" ] ; then + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$sys" + fi done export LD_LIBRARY_PATH