diff --git a/spk/selfoss/Makefile b/spk/selfoss/Makefile index bacba6005bb..54f011df6c8 100644 --- a/spk/selfoss/Makefile +++ b/spk/selfoss/Makefile @@ -1,6 +1,6 @@ SPK_NAME = selfoss SPK_VERS = 2.19 -SPK_REV = 7 +SPK_REV = 8 SPK_ICON = src/selfoss.png DEPENDS = cross/selfoss diff --git a/spk/selfoss/src/wizard/install_uifile.sh b/spk/selfoss/src/wizard/install_uifile.sh index 67f41cd30f3..57ab8345d3f 100644 --- a/spk/selfoss/src/wizard/install_uifile.sh +++ b/spk/selfoss/src/wizard/install_uifile.sh @@ -20,12 +20,11 @@ page_append () check_php_profiles () { PHP_CFG_PATH="/usr/syno/etc/packages/WebStation/PHPSettings.json" - if [ "${SYNOPKG_DSM_VERSION_MAJOR}" -lt 7 ]; then - if jq -e 'to_entries | map(select((.key | startswith("com-synocommunity-packages-")) and .key != "com-synocommunity-packages-selfoss")) | length > 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-selfoss")) | length > 0' "${PHP_CFG_PATH}" >/dev/null; then + return 0 # true + else + return 1 # false fi } diff --git a/spk/selfoss/src/wizard/install_uifile_fre.sh b/spk/selfoss/src/wizard/install_uifile_fre.sh index d3b1a9e9efd..c20cb73a9f9 100644 --- a/spk/selfoss/src/wizard/install_uifile_fre.sh +++ b/spk/selfoss/src/wizard/install_uifile_fre.sh @@ -20,12 +20,11 @@ page_append () check_php_profiles () { PHP_CFG_PATH="/usr/syno/etc/packages/WebStation/PHPSettings.json" - if [ "${SYNOPKG_DSM_VERSION_MAJOR}" -lt 7 ]; then - if jq -e 'to_entries | map(select((.key | startswith("com-synocommunity-packages-")) and .key != "com-synocommunity-packages-selfoss")) | length > 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-selfoss")) | length > 0' "${PHP_CFG_PATH}" >/dev/null; then + return 0 # true + else + return 1 # false fi }