diff --git a/spk/tt-rss/Makefile b/spk/tt-rss/Makefile index f935f485323..e2993265286 100644 --- a/spk/tt-rss/Makefile +++ b/spk/tt-rss/Makefile @@ -1,6 +1,6 @@ SPK_NAME = tt-rss SPK_VERS = 20230828 -SPK_REV = 17 +SPK_REV = 18 SPK_ICON = src/tt-rss.png DEPENDS = cross/$(SPK_NAME) @@ -15,7 +15,7 @@ MAINTAINER = moneytoo 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. DISPLAY_NAME = Tiny Tiny RSS -CHANGELOG = "1. Update Tiny Tiny RSS to Git revision afd04d141c \(20230828\).
2. Fix for DSM 6 app startup." +CHANGELOG = "1. Update Tiny Tiny RSS to Git revision afd04d141c (20230828).
2. Fix for DSM 6 app startup." HOMEPAGE = https://tt-rss.org/ LICENSE = GPL diff --git a/spk/tt-rss/src/wizard_templates/install_uifile.sh b/spk/tt-rss/src/wizard_templates/install_uifile.sh index 4ff3f930294..b25f72b8183 100644 --- a/spk/tt-rss/src/wizard_templates/install_uifile.sh +++ b/spk/tt-rss/src/wizard_templates/install_uifile.sh @@ -1,5 +1,7 @@ #!/bin/bash +INTERNAL_IP=$(ip -4 route get 8.8.8.8 | awk '/8.8.8.8/ && /src/ {print $NF}') + quote_json () { sed -e 's|\\|\\\\|g' -e 's|\"|\\\"|g' @@ -21,7 +23,7 @@ getPasswordValidator() validator=$(/bin/cat< 0' "${PHP_CFG_PATH}" >/dev/null; then - return 0 # true - else - return 1 # false - fi + if [ "${SYNOPKG_DSM_VERSION_MAJOR}" -lt 7 ] && \ + jq -e 'to_entries | map(select((.key | startswith("com-synocommunity-packages-")) and .key != "com-synocommunity-packages-tt-rss")) | length > 0' "${PHP_CFG_PATH}" >/dev/null; then + return 0 # true + else + return 1 # false fi } @@ -69,9 +70,8 @@ PAGE_TTRSS_SETUP=$(/bin/cat<"${SYNOPKG_TEMP_LOGFILE}" [ { "step_title": "{{DB_MIGRATION_TITLE}}", + "invalid_next_disabled_v2": true, "items": [ { "type": "multiselect", "subitems": [ { @@ -18,11 +19,11 @@ function with_migration "defaultValue": false, "hidden": true }, { - "key": "mysql_grant_user", - "desc": "Initializes user rights", - "defaultValue": true, - "hidden": true - } ] + "key": "mysql_grant_user", + "desc": "Initializes user rights", + "defaultValue": true, + "hidden": true + } ] }, { "type": "password", "desc": "{{ROOT_PASSWORD_INPUT_DESCRIPTIONS}}", @@ -40,13 +41,13 @@ function with_migration } } ] }, { - "type": "password", - "desc": "{{ENTER_TT-RSS_PASSWORD}}", - "subitems": [{ - "key": "wizard_mysql_password_ttrss", - "desc": "{{TT-RSS_PASSWORD_DESCRIPTION}}" - }] - } ] + "type": "password", + "desc": "{{ENTER_TT-RSS_PASSWORD}}", + "subitems": [{ + "key": "wizard_mysql_password_ttrss", + "desc": "{{TT-RSS_PASSWORD_DESCRIPTION}}" + }] + } ] } ] EOF }