From b6f4da7692e5b13bdc8f5990189b4ff2fe88b1b4 Mon Sep 17 00:00:00 2001
From: Matthias Stecher <matthiasstecher@gmx.de>
Date: Sat, 24 Oct 2020 15:39:54 +0200
Subject: [PATCH] __nextcloud: completly respect --install-only parameter

This commit changes the manifest to do not check for too low versions
and does not download and unpack a tarball if available if the parameter
--install-only is set. This should make it useable now.

Also, a short message change to match the manual.
---
 type/__nextcloud/gencode-remote |  2 +-
 type/__nextcloud/manifest       | 34 +++++++++++++++++++--------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/type/__nextcloud/gencode-remote b/type/__nextcloud/gencode-remote
index 9da3b86..0a68a02 100755
--- a/type/__nextcloud/gencode-remote
+++ b/type/__nextcloud/gencode-remote
@@ -187,7 +187,7 @@ if [ -s "$__object/files/conf-cmds" ]; then
     printf "SU\n"
 
     # print a message
-    echo config >> "$__messages_out"
+    echo configured >> "$__messages_out"
 fi
 
 
diff --git a/type/__nextcloud/manifest b/type/__nextcloud/manifest
index f6b8865..2d89f01 100755
--- a/type/__nextcloud/manifest
+++ b/type/__nextcloud/manifest
@@ -94,27 +94,33 @@ nextcloud_uri="https://download.nextcloud.com/server/releases/nextcloud-${versio
 nextcloud_sum="${nextcloud_uri}.sha256"
 
 
-# Only check if there is a current installation
+# Check if there is a current installation. It depends where the upstream
+# tarball should be unpacked (directly or moved in a later stage).
 if [ "$version_is" ]; then
-    # Block downgrades as there are may caused from the automatic upgrader
-    # if the current version is higher than the version that should be installed
-    if version_ge "$version_is" "$version_should"; then
-        # it's an error if the current version is higher than the one that should be installed
-        printf "The current nextcloud version '%s' is higher than the version that should be installed (%s)\n" \
-           "$version_is" "$version_should" >&2
-        printf "Please bump the nextcloud version to '%s' or higher!\n" "$version_is" >&2
-        exit 2
-    fi
+    # Only set and check the version if a upgrade is allowed.
+    #  if this block will be skipped, no upgrade will be done
+    if ! [ -f "$__object/parameter/install-only" ]; then
+        # Block downgrades as there are may caused from the automatic upgrader
+        # if the current version is higher than the version that should be installed
+        if version_ge "$version_is" "$version_should"; then
+            # it's an error if the current version is higher than the one that should be installed
+            printf "The current nextcloud version '%s' is higher than the version that should be installed (%s)\n" \
+               "$version_is" "$version_should" >&2
+            printf "Please bump the nextcloud version to '%s' or higher!\n" "$version_is" >&2
+            exit 2
+        fi
 
-    # Set destination to a temporary directory
-    destination="$webroot/.$__object_id"
+        # Set destination to a temporary directory
+        destination="$webroot/.$__object_id"
+    fi
 else
     # Set destination to the real destination
     destination="$webroot/$__object_id"
 fi
 
-# Upgrade the nextcloud version
-if [ "$version_is" != "$version_should" ]; then
+# Install/Upgrade the nextcloud version if there is a destination set.
+#  it checks if it is necessary and intended to upgrade
+if [ "$destination" ] && [ "$version_is" != "$version_should" ]; then
     updatedir="$( dirname "$installdir" )"
 
     # Be sure the parent directory exists for installation