Merge pull request #1976 from saschpe/ttrss-dsm6-and-update

SynoCommunity · Jan 3, 2016 · c208ca9 · c208ca9
2 parents e61bc04 + de11b90
commit c208ca9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/cross/tt-rss/Makefile b/cross/tt-rss/Makefile
@@ -1,9 +1,8 @@
 PKG_NAME = tt-rss
-PKG_FULL_NAME = Tiny-Tiny-RSS
 PKG_EXT = tar.gz
 PKG_DOWNLOAD_METHOD = git
-PKG_GIT_HASH = 35c12dc
-PKG_DIST_SITE = https://github.com/gothfox/$(PKG_FULL_NAME).git
+PKG_GIT_HASH = 7f4fff96
+PKG_DIST_SITE = https://tt-rss.org/gitlab/fox/$(PKG_NAME).git
 PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-git$(PKG_GIT_HASH)
 

diff --git a/spk/tt-rss/Makefile b/spk/tt-rss/Makefile
@@ -1,18 +1,17 @@
 SPK_NAME = tt-rss
-SPK_VERS = 20150616
-SPK_REV = 9
+SPK_VERS = 20160102
+SPK_REV = 10
 SPK_ICON = src/tt-rss.png
 DSM_UI_DIR = app
 
 DEPENDS  = cross/busybox cross/$(SPK_NAME)
-
 MAINTAINER = SynoCommunity
 DESCRIPTION = Tiny Tiny RSS is an open source web-based news feed \(RSS/Atom\) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible.
 DESCRIPTION_FRE = Tiny Tiny RSS est un agrégateur et lecteur web de flux RSS et Atom open source conçu pour vous permettre de lire des nouvelles de n\\\'importe quel endroit, tout en se sentant aussi proche d\\\'une application de bureau que possible.
 ADMIN_URL = /tt-rss/
 RELOAD_UI = yes
 DISPLAY_NAME = Tiny Tiny RSS
-CHANGELOG = "1. Update Tiny Tiny RSS to Git revision 35c12dc<br>2. Preserve local themes and plugins<br>3. Fix DSM4.3 compatibility"
+CHANGELOG = "1. Update Tiny Tiny RSS to Git revision 7f4fff96<br>2. Fix DSM-6.0 compatibility"
 
 HOMEPAGE   = http://tt-rss.org/
 LICENSE    = GPL

diff --git a/spk/tt-rss/src/conf/PKG_DEPS b/spk/tt-rss/src/conf/PKG_DEPS
@@ -1,2 +1,5 @@
 [MariaDB]
 dsm_min_ver=5.0-4300
+
+[PHP5.6]
+dsm_min_ver=6.0-7135
diff --git a/spk/tt-rss/src/dsm-control.sh b/spk/tt-rss/src/dsm-control.sh
@@ -8,8 +8,8 @@ DNAME="Tiny Tiny RSS"
 INSTALL_DIR="/usr/local/${PACKAGE}"
 WEB_DIR="/var/services/web"
 PATH="${INSTALL_DIR}/bin:${PATH}"
-USER="$([ $(grep buildnumber /etc.defaults/VERSION | cut -d"\"" -f2) -ge 4418 ] && echo -n http || echo -n nobody)"
-PHP="/usr/bin/php"
+USER="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 4418 ] && echo -n http || echo -n nobody)"
+PHP="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /usr/local/bin/php56 || echo -n /usr/bin/php)"
 TTRSS="${WEB_DIR}/${PACKAGE}/update.php"
 PID_FILE="${INSTALL_DIR}/var/tt-rss.pid"
 

diff --git a/spk/tt-rss/src/installer.sh b/spk/tt-rss/src/installer.sh
@@ -8,7 +8,8 @@ DNAME="Tiny Tiny RSS"
 INSTALL_DIR="/usr/local/${PACKAGE}"
 SSS="/var/packages/${PACKAGE}/scripts/start-stop-status"
 WEB_DIR="/var/services/web"
-USER="$([ $(grep buildnumber /etc.defaults/VERSION | cut -d"\"" -f2) -ge 4418 ] && echo -n http || echo -n nobody)"
+USER="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 4418 ] && echo -n http || echo -n nobody)"
+PHP="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /usr/local/bin/php56 || echo -n /usr/bin/php)"
 MYSQL="/usr/syno/mysql/bin/mysql"
 MYSQLDUMP="/usr/syno/mysql/bin/mysqldump"
 MYSQL_USER="ttrss"
@@ -62,6 +63,7 @@ postinst ()
             -e "s|define('DB_PASS', \".*\");|define('DB_PASS', '${wizard_mysql_password_ttrss}');|" \
             -e "s|define('SINGLE_USER_MODE', .*);|define('SINGLE_USER_MODE', ${single_user_mode});|" \
             -e "s|define('SELF_URL_PATH', '.*');|define('SELF_URL_PATH', 'http://${wizard_domain_name}/${PACKAGE}/');|" \
+            -e "s|define('PHP_EXECUTABLE',  '.*');|define('PHP_EXECUTABLE', '$(PHP)');|" \
             ${WEB_DIR}/${PACKAGE}/config.php-dist > ${WEB_DIR}/${PACKAGE}/config.php
     fi