YunoHost-Apps/nextcloud_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/nextcloud_ynh.git synced 2024-09-03 19:55:57 +02:00
Code Issues Activity Actions

fix upgrade for new major version

Browse source
This commit is contained in:
Kay0u 2020-10-13 14:52:32 +02:00
parent 30759821ec
commit 3735ac2ad2
No known key found for this signature in database
GPG key ID: AAFEEB16CFA2AE2D
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/upgrade
View file

@ -212,8 +212,8 @@ exec_occ() {
create_external_storage() { create_external_storage() {
local datadir="$1" local datadir="$1"
local mount_name="$2" local mount_name="$2"
local mount_id=`exec_occ files_external:create --output=json \ local mount_id=$(exec_occ files_external:create --output=json \
"$mount_name" 'local' 'null::null' -c "datadir=$datadir" || true` "$mount_name" 'local' 'null::null' -c "datadir=$datadir" || true)
! [[ $mount_id =~ ^[0-9]+$ ]] \ ! [[ $mount_id =~ ^[0-9]+$ ]] \
&& ynh_print_warn --message="Unable to create external storage" \ && ynh_print_warn --message="Unable to create external storage" \
|| exec_occ files_external:option "$mount_id" enable_sharing true || exec_occ files_external:option "$mount_id" enable_sharing true
@ -244,9 +244,17 @@ then
# The major version is the first part of the version number # The major version is the first part of the version number
current_major_version=${current_version%%.*} current_major_version=${current_version%%.*}
if [ ! -f upgrade.d/upgrade.$current_major_version.sh ]; then
source upgrade.d/upgrade.last.sh
else
source upgrade.d/upgrade.$current_major_version.sh
fi
# If the current version has the same major version than the next one, # If the current version has the same major version than the next one,
# then it's the last upgrade to do # then it's the last upgrade to do
if [ "$last_major_version" -eq "$current_major_version" ]; then # We also cover the case where the last version is the first of the current major version series
# (e.g. 20.0.0 is the latest version)
if [[ ("$last_major_version" -eq "$current_major_version") || ( ("$last_major_version" -eq "$((current_major_version+1))") && ("$next_version" == "$last_version") ) ]]; then
current_major_version=last current_major_version=last
# Enable YunoHost patches on Nextcloud sources # Enable YunoHost patches on Nextcloud sources
cp -a ../sources/patches_last_version/* ../sources/patches cp -a ../sources/patches_last_version/* ../sources/patches