Fixes following code review

Author: mreid-tt

spk/owncloud/Makefile

@@ -11,7 +11,7 @@ REQUIRED_MIN_DSM = 6.0
 
 MAINTAINER = ymartin59
 DESCRIPTION = ownCloud is a personal cloud which runs on your own server and gives you freedom and control over your own data.
-CHANGELOG = "1. Update ownCloud to 10.12.<br/>2. Use faster SQLite database.<br.>3. Use shared folder for data directory."
+CHANGELOG = "1. Update ownCloud to 10.12.<br/>2. Use faster SQLite database.<br/>3. Use shared folder for data directory."
 DISPLAY_NAME = ownCloud
 HOMEPAGE = https://owncloud.org/
 LICENSE = AGPL

spk/owncloud/src/service-setup.sh

@@ -50,19 +50,13 @@ set_owncloud_permissions ()
 exec_occ() {
     PHP="/usr/local/bin/php74"
     OCC="${OCROOT}/occ"
-    OCC_ARGS=()
-    for arg in "$@"; do
-        OCC_ARGS+=("$arg")
-    done
-    COMMAND="${PHP} ${OCC} ${OCC_ARGS[@]}"
+    COMMAND="${PHP} ${OCC} $*"
     if [ ${SYNOPKG_DSM_VERSION_MAJOR} -lt 7 ]; then
-        OCC_OUTPUT=$(/bin/su "$EFF_USER" -s /bin/sh -c "$COMMAND")
+        /bin/su "$EFF_USER" -s /bin/sh -c "$COMMAND"
     else
-        OCC_OUTPUT=$($COMMAND)
+        $COMMAND
     fi
-    OCC_EXIT_CODE=$?
-    echo "$OCC_OUTPUT"
-    return $OCC_EXIT_CODE
+    return $?
 }
 
 service_prestart ()
@@ -74,11 +68,6 @@ service_prestart ()
     echo "$!" > "${PID_FILE}"
 }
 
-service_preinst ()
-{
-    :
-}
-
 service_postinst ()
 {
     if [ ${SYNOPKG_DSM_VERSION_MAJOR} -lt 7 ]; then
@@ -122,7 +111,7 @@ service_postinst ()
         # Check for ownCloud PHP profile
         if ! ${JQ} -e '.["com-synocommunity-packages-owncloud"]' "${WS_CFG_PATH}/${PHP_CFG_FILE}" >/dev/null; then
             echo "Add PHP profile for ownCloud"
-            ${JQ} --argfile ocNode ${SYNOPKG_PKGDEST}/web/owncloud.json '.["com-synocommunity-packages-owncloud"] = $ocNode' ${WS_CFG_PATH}/${PHP_CFG_FILE} > ${TEMPDIR}/${PHP_CFG_FILE}
+            ${JQ} --slurpfile ocNode ${SYNOPKG_PKGDEST}/web/owncloud.json '.["com-synocommunity-packages-owncloud"] = $ocNode[0]' ${WS_CFG_PATH}/${PHP_CFG_FILE} > ${TEMPDIR}/${PHP_CFG_FILE}
             ${MV} ${WS_CFG_PATH}/${PHP_CFG_FILE} ${WS_CFG_PATH}/${PHP_CFG_FILE}.bak
             rsync -aX ${TEMPDIR}/${PHP_CFG_FILE} ${WS_CFG_PATH}/ 2>&1
             ${RM} ${TEMPDIR}/${PHP_CFG_FILE}
@@ -368,6 +357,7 @@ service_save ()
         echo "Invalid data directory '$DATADIR'. Using the default data directory instead."
         DATADIR="${OCROOT}/data"
     fi
+    # Check if data directory inside owncloud directory and flag for restore if true
     DATADIR_REAL=$(realpath "$DATADIR")
     WEBROOT_REAL=$(realpath "${OCROOT}")
     if echo "$DATADIR_REAL" | grep -q "^$WEBROOT_REAL"; then
@@ -495,13 +485,3 @@ service_restore ()
     ${RM} ${SYNOPKG_TEMP_UPGRADE_FOLDER}/${SYNOPKG_PKGNAME}
     ${RM} ${SYNOPKG_TEMP_UPGRADE_FOLDER}/db_backup
 }
-
-service_preupgrade ()
-{
-    :
-}
-
-service_postupgrade ()
-{
-    :
-}

spk/owncloud/src/wizard/uninstall_uifile.sh

@@ -20,19 +20,13 @@ OCROOT="${WEB_DIR}/${SYNOPKG_PKGNAME}"
 exec_occ() {
 	PHP="/usr/local/bin/php74"
 	OCC="${OCROOT}/occ"
-	OCC_ARGS=()
-	for arg in "$@"; do
-		OCC_ARGS+=("$arg")
-	done
-	COMMAND="${PHP} ${OCC} ${OCC_ARGS[@]}"
+	COMMAND="${PHP} ${OCC} $*"
 	if [ ${SYNOPKG_DSM_VERSION_MAJOR} -lt 7 ]; then
-		OCC_OUTPUT=$(/bin/su "$EFF_USER" -s /bin/sh -c "$COMMAND")
+		/bin/su "$EFF_USER" -s /bin/sh -c "$COMMAND"
 	else
-		OCC_OUTPUT=$($COMMAND)
+		$COMMAND
 	fi
-	OCC_EXIT_CODE=$?
-	echo "$OCC_OUTPUT"
-	return $OCC_EXIT_CODE
+	return $?
 }
 
 quote_json () {

spk/owncloud/src/wizard/uninstall_uifile_fre.sh

@@ -20,19 +20,13 @@ OCROOT="${WEB_DIR}/${SYNOPKG_PKGNAME}"
 exec_occ() {
 	PHP="/usr/local/bin/php74"
 	OCC="${OCROOT}/occ"
-	OCC_ARGS=()
-	for arg in "$@"; do
-		OCC_ARGS+=("$arg")
-	done
-	COMMAND="${PHP} ${OCC} ${OCC_ARGS[@]}"
+	COMMAND="${PHP} ${OCC} $*"
 	if [ ${SYNOPKG_DSM_VERSION_MAJOR} -lt 7 ]; then
-		OCC_OUTPUT=$(/bin/su "$EFF_USER" -s /bin/sh -c "$COMMAND")
+		/bin/su "$EFF_USER" -s /bin/sh -c "$COMMAND"
 	else
-		OCC_OUTPUT=$($COMMAND)
+		$COMMAND
 	fi
-	OCC_EXIT_CODE=$?
-	echo "$OCC_OUTPUT"
-	return $OCC_EXIT_CODE
+	return $?
 }
 
 quote_json () {