__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.
This commit is contained in:
parent
ea58f98ecb
commit
b6f4da7692
2 changed files with 21 additions and 15 deletions
|
@ -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
|
||||
|
||||
|
||||
|
|
|
@ -94,8 +94,12 @@ 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
|
||||
# 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
|
||||
|
@ -108,13 +112,15 @@ if [ "$version_is" ]; then
|
|||
|
||||
# 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
|
||||
|
|
Loading…
Reference in a new issue