Update and fix flexget (SynoCommunity#3035)

- Update Flexget to version 2.21.24
- Fix user and group creation
- Fix installation wizard

use official pyload icon

spk/flexget/Makefile

@@ -1,6 +1,6 @@
 SPK_NAME = flexget
-SPK_VERS = 2.9.14
-SPK_REV = 6
+SPK_VERS = 2.21.24
+SPK_REV = 7
 SPK_ICON = src/flexget.png
 
 WHEELS = src/requirements.txt
@@ -9,8 +9,8 @@ SPK_DEPENDS = "python>=2.7.8-11"
 MAINTAINER = Diaoul
 DESCRIPTION = FlexGet is a multipurpose automation tool for content like torrents, nzbs, podcasts, comics, series, movies, etc. It can use different kinds of sources like RSS-feeds, html pages, csv files, search engines and there are even plugins for sites that do not provide any kind of useful feeds.
 DISPLAY_NAME = FlexGet
-BETA = 1
-CHANGELOG = "Update Flexget to version 2.9.14"
+
+CHANGELOG = "1. Update Flexget to version 2.21.24<br>2. Fix user and group creation<br>3. Fix installation wizard"
 
 HOMEPAGE   = http://flexget.com/
 LICENSE    = GPL

spk/flexget/src/dsm-control.sh

@@ -10,6 +10,7 @@ PYTHON_DIR="/usr/local/python"
 PATH="${INSTALL_DIR}/bin:${INSTALL_DIR}/env/bin:${PYTHON_DIR}/bin:${PATH}"
 PYTHON="${INSTALL_DIR}/env/bin/python"
 BUILDNUMBER="$(/bin/get_key_value /etc.defaults/VERSION buildnumber)"
+MAJOR_VERSION="$(/bin/get_key_value /etc.defaults/VERSION majorversion)"
 FLEXGET="${INSTALL_DIR}/env/bin/flexget"
 CFG_FILE="${INSTALL_DIR}/var/config.yml"
 PID_FILE="${INSTALL_DIR}/var/.config-lock"
@@ -18,16 +19,17 @@ LOG_FILE="${INSTALL_DIR}/var/flexget.log"
 SC_USER="sc-flexget"
 LEGACY_USER="flexget"
 USER="$([ "${BUILDNUMBER}" -ge "7321" ] && echo -n ${SC_USER} || echo -n ${LEGACY_USER})"
+SUDO="$([ "${MAJOR_VERSION}" -ge "6" ] && echo 'sudo -u' || echo 'su' )"
 
 
 start_daemon ()
 {
-    su ${USER} -s /bin/sh -c "${FLEXGET} -c ${CFG_FILE} --logfile ${LOG_FILE} daemon start -d"
+    ${SUDO} ${USER} -s /bin/sh -c "${FLEXGET} -c ${CFG_FILE} --logfile ${LOG_FILE} daemon start -d"
 }
 
 stop_daemon ()
 {
-    su ${USER} -s /bin/sh -c "${FLEXGET} -c ${CFG_FILE} --logfile ${LOG_FILE} daemon stop"
+    ${SUDO} ${USER} -s /bin/sh -c "${FLEXGET} -c ${CFG_FILE} --logfile ${LOG_FILE} daemon stop"
 }
 
 daemon_status ()

spk/pyload/Makefile

@@ -13,7 +13,7 @@ ADMIN_PORT = 8190
 RELOAD_UI = yes
 STARTABLE = yes
 DISPLAY_NAME = pyLoad
-CHANGELOG = Fix updatemanager
+CHANGELOG = Fix application start
 
 HOMEPAGE   = http://pyload.net
 LICENSE    = GPLv3