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

Browse source
This commit is contained in:
Kay0u 2020-08-17 17:07:34 +02:00
parent 2667722dc9
commit 74f3112fea
No known key found for this signature in database
GPG key ID: AE1DCADB6415A156
3 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/install
View file

@ -273,7 +273,12 @@ exec_occ background:cron
# POST-INSTALL MAINTENANCE # POST-INSTALL MAINTENANCE
#================================================= #=================================================
(cd /tmp ; at now + 10 minutes <<< "(cd $final_path ; sudo -u $app php${YNH_PHP_VERSION} occ db:add-missing-indices ; sudo -u $app php${YNH_PHP_VERSION} occ db:convert-filecache-bigint -n) > /tmp/${app}_maintenance.log") (
cd $final_path
sudo -u $app php${YNH_PHP_VERSION} occ db:add-missing-indices
sudo -u $app php${YNH_PHP_VERSION} occ db:add-missing-columns
sudo -u $app php${YNH_PHP_VERSION} occ db:convert-filecache-bigint -n
)
#================================================= #=================================================
# CONFIGURE THE HOOK FILE FOR USER CREATE # CONFIGURE THE HOOK FILE FOR USER CREATE

25
scripts/upgrade
View file

@ -229,6 +229,8 @@ then
source upgrade.d/upgrade.last.sh source upgrade.d/upgrade.last.sh
last_version=$next_version last_version=$next_version
last_major_version=${last_version%%.*}
# Set write access for the following commands # Set write access for the following commands
chown -R $app: "$final_path" "$datadir" chown -R $app: "$final_path" "$datadir"
@ -240,23 +242,19 @@ then
do do
# The major version is the first part of the version number # The major version is the first part of the version number
# major_version=${next_version%%.*}
major_version=${last_version%%.*}
current_major_version=${current_version%%.*} current_major_version=${current_version%%.*}
# Load the value for this version
source upgrade.d/upgrade.$current_major_version.sh
# 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
# We also cover the case where the last version is the first of the current major version series if [ "$last_major_version" -eq "$current_major_version" ]; then
# (e.g. 19.0.0 is the latest version)
if [[ ("$major_version" -eq "$current_major_version") || ( ("$major_version" -eq "$((current_major_version+1))") && ("$next_version" == "$last_version") ) ]]; then
current_major_version=last current_major_version=last
# Execute the commands dedicated to the last upgrade # Enable YunoHost patches on Nextcloud sources
last_upgrade_operations cp -a ../sources/patches_last_version/* ../sources/patches
fi fi
# Load the value for this version
source upgrade.d/upgrade.$current_major_version.sh
ynh_print_info --message="Upgrade to nextcloud $next_version" ynh_print_info --message="Upgrade to nextcloud $next_version"
# Create an app.src for this version of nextcloud # Create an app.src for this version of nextcloud
@ -311,6 +309,13 @@ then
exec_occ -V exec_occ -V
done done
(
cd $final_path
sudo -u $app php${YNH_PHP_VERSION} occ db:add-missing-indices
sudo -u $app php${YNH_PHP_VERSION} occ db:add-missing-columns
sudo -u $app php${YNH_PHP_VERSION} occ db:convert-filecache-bigint -n
)
#================================================= #=================================================
# CONFIGURE NEXTCLOUD # CONFIGURE NEXTCLOUD
#================================================= #=================================================

9
scripts/upgrade.d/upgrade.last.sh
View file

@ -5,12 +5,3 @@ next_version="19.0.1"
# Nextcloud tarball checksum sha256 # Nextcloud tarball checksum sha256
nextcloud_source_sha256="4ef311e00d939915d3a9714cd3a1ad436db9157e04620e4a88c2f427e5e65b2d" nextcloud_source_sha256="4ef311e00d939915d3a9714cd3a1ad436db9157e04620e4a88c2f427e5e65b2d"
# This function will only be executed upon applying the last upgrade referenced above
last_upgrade_operations () {
# Patch nextcloud files only for the last version
cp -a ../sources/patches_last_version/* ../sources/patches
# Execute post-upgrade operations later on
(cd /tmp ; at now + 10 minutes <<< "(cd $final_path ; sudo -u $app php${YNH_PHP_VERSION} occ db:add-missing-indices ; sudo -u $app php${YNH_PHP_VERSION} occ db:add-missing-columns ; sudo -u $app php${YNH_PHP_VERSION} occ db:convert-filecache-bigint -n) > /tmp/${app}_maintenance.log")
}