From 0e56a2f8b43a04f999248028e86bdf7495615200 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sun, 18 Mar 2018 08:59:10 +0100 Subject: [PATCH] Fix upgrade old version (#99) * Fix upgrade old version * Move to an existing if --- scripts/upgrade | 2 ++ .../app-00-add-logout_url-conf.patch | 0 .../app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch | 0 3 files changed, 2 insertions(+) rename sources/{patches => patches_last_version}/app-00-add-logout_url-conf.patch (100%) rename sources/{patches => patches_last_version}/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch (100%) diff --git a/scripts/upgrade b/scripts/upgrade index a156b9f..099d842 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -176,6 +176,8 @@ do # then it's the last upgrade to do if [ "$major_version" -eq "$current_major_version" ]; then current_major_version=last + # Patch nexcloud files only for the last upgrade. + cp -a ../sources/patches_last_version ../sources/patches fi # Load the value for this version diff --git a/sources/patches/app-00-add-logout_url-conf.patch b/sources/patches_last_version/app-00-add-logout_url-conf.patch similarity index 100% rename from sources/patches/app-00-add-logout_url-conf.patch rename to sources/patches_last_version/app-00-add-logout_url-conf.patch diff --git a/sources/patches/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch b/sources/patches_last_version/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch similarity index 100% rename from sources/patches/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch rename to sources/patches_last_version/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch