From c3d98f658f4f9c35cfb9d99ed3fecc190f439b68 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Sat, 29 Jun 2024 18:50:00 +0200
Subject: [PATCH] fix initialization of SHARE_PATH variable on DSM 7 (#6163)

- this is a leftover of shared folder redesign (#5649)
- DSM 7 does not allow to call synohare (Permission denied)
---
 mk/spksrc.service.installer.functions | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/mk/spksrc.service.installer.functions b/mk/spksrc.service.installer.functions
index c705c81db7c..a96e3313fd2 100644
--- a/mk/spksrc.service.installer.functions
+++ b/mk/spksrc.service.installer.functions
@@ -18,6 +18,8 @@ TAR="/bin/tar"
 
 INST_ETC="/var/packages/${SYNOPKG_PKGNAME}/etc"
 INST_VARIABLES="${INST_ETC}/installer-variables"
+# DSM7 only
+INST_SHARES="/var/packages/${SYNOPKG_PKGNAME}/shares"
 
 if [ -z "${SYNOPKG_PKGVAR}" ]; then
     # define SYNOPKG_PKGVAR for compatibility with DSM7 (replaces former INST_VAR)
@@ -51,10 +53,20 @@ initialize_variables ()
         # this is required for installers without resource worker for file share (SRM 1, DSM 5, DSM 6 old packages)
         if [ "$(echo ${SHARE_PATH} | grep ^/)" != "${SHARE_PATH}" ]; then
             SHARE_NAME=${SHARE_PATH}
-            if synoshare --get "${SHARE_NAME}" &> /dev/null; then
-                SHARE_PATH=$(synoshare --get "${SHARE_NAME}" | awk 'NR==4' | cut -d] -f1 | cut -d[ -f2)
-                install_log "Path of existing share [${SHARE_NAME}] is [${SHARE_PATH}]"
+            if [ ${SYNOPKG_DSM_VERSION_MAJOR} -lt 7 ]; then
+                if synoshare --get "${SHARE_NAME}" &> /dev/null; then
+                    SHARE_PATH=$(synoshare --get "${SHARE_NAME}" | awk 'NR==4' | cut -d] -f1 | cut -d[ -f2)
+                    install_log "Path of existing share [${SHARE_NAME}] is [${SHARE_PATH}]"
+                fi
             else
+                # synoshare fails on DSM 7 (at least on 7.2.1) with "Permission denied"
+                # but DSM 7 links package specific shares to the package installation folder
+                if [ -d ${INST_SHARES}/${SHARE_NAME} ]; then
+                    SHARE_PATH=$(realpath ${INST_SHARES}/${SHARE_NAME})
+                    install_log "Path of existing share [${SHARE_NAME}] is [${SHARE_PATH}]"
+                fi
+            fi
+            if [ ! -d "${SHARE_PATH}" ]; then
                 install_log "SHARE_NAME is not an existing share [${SHARE_PATH}]."
             fi
         fi