From 09e60038538ea0538a18bc1a062c8419069d130f Mon Sep 17 00:00:00 2001
From: mreid-tt <943378+mreid-tt@users.noreply.github.com>
Date: Sat, 9 Dec 2023 13:46:18 -0400
Subject: [PATCH 1/2] Fix wizard logic

---
 spk/selfoss/src/wizard/install_uifile.sh     | 11 +++++------
 spk/selfoss/src/wizard/install_uifile_fre.sh | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

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
 }
 

From dec01c0b1f9e8d59d0abaa4088c2c0a954636575 Mon Sep 17 00:00:00 2001
From: mreid-tt <943378+mreid-tt@users.noreply.github.com>
Date: Sat, 9 Dec 2023 13:48:12 -0400
Subject: [PATCH 2/2] Version bump

---
 spk/selfoss/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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