From c38e8df3f46ee538b34184803cd713a8609cf460 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Tue, 16 Oct 2018 22:37:09 +0200
Subject: [PATCH] upgrade to 2.20

---
 check_process                                               | 6 +++---
 .../settings_history/{settings.3.2.0.py => settings.3.2.py} | 0
 manifest.json                                               | 2 +-
 scripts/_common.sh                                          | 2 +-
 scripts/upgrade                                             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename conf/settings_history/{settings.3.2.0.py => settings.3.2.py} (100%)

diff --git a/check_process b/check_process
index d5ea6db..a6aba11 100644
--- a/check_process
+++ b/check_process
@@ -19,7 +19,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		# upgrade=1		from_commit=f2c1f14df484d727f1918821b6ade3887f77ec40
+		upgrade=1		from_commit=f14080cbe65c8b2a8e0cda1c34affe0123a6540d
 		backup_restore=1
 		multi_instance=1
 		incorrect_path=1
@@ -42,6 +42,6 @@
 Email=jean-baptiste@holcroft.fr
 Notification=all
 ;;; Upgrade options
-	; commit=f2c1f14df484d727f1918821b6ade3887f77ec40
-		name=Upgrade from 2.20
+	; commit=f14080cbe65c8b2a8e0cda1c34affe0123a6540d
+		name=Upgrade from 3.1.1
 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&github_account=fake&github_token=fake
diff --git a/conf/settings_history/settings.3.2.0.py b/conf/settings_history/settings.3.2.py
similarity index 100%
rename from conf/settings_history/settings.3.2.0.py
rename to conf/settings_history/settings.3.2.py
diff --git a/manifest.json b/manifest.json
index 38e70e0..739fb0d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
 	"description": {
 		"en": "A translation platform using Git and Python"
 	},
-	"version": "3.2.0~ynh1",
+	"version": "3.2~ynh1",
 	"url": "https://weblate.org",
 	"license": "AGPL-3.0",
 	"maintainer": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 428c56c..6b10cee 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-current_version="3.2.0"
+current_version="3.2"
 
 ynh_check_global_uwsgi_config () {
 	uwsgi --version || ynh_die "You need to add uwsgi (and appropriate plugin) as a dependency"
diff --git a/scripts/upgrade b/scripts/upgrade
index 1065456..a91a3c0 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -107,7 +107,7 @@ fi
 
 # Weblate requires an update to 3.0 before 3.1
 # the upgrade hook will launch this script again to make sure it works
-if [[ -z "$migration311" ]]
+if [[ -z "$migration311" && $previous_version = "2.20" ]]
 then
 	# $migration311 is not set, version is <3.0
 	migration311="two_steps_upgrade_3.0to3.1-needed"