From f67bb5ed290c958669e72590c8aef6d146e961ad Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Sun, 3 Jun 2018 15:44:13 +0200
Subject: [PATCH] Upgrade to 0.14

---
 check_process         | 6 +++---
 conf/app-frontend.src | 4 ++--
 conf/app.src          | 4 ++--
 manifest.json         | 2 +-
 scripts/_common.sh    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/check_process b/check_process
index ac15523..b1c1cb4 100644
--- a/check_process
+++ b/check_process
@@ -17,7 +17,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1		from_commit=9b30b385673eb4dda1c85a84a9cacf8409cf4ab7
+		upgrade=1		from_commit=5d26c33b91a98c7e9e830edbd7150a3cc9a1e7dd
 		backup_restore=1
 		multi_instance=1
 		incorrect_path=0
@@ -40,6 +40,6 @@
 Email=jean-baptiste@holcroft.fr
 Notification=all
 ;;; Upgrade options
-	; commit=9b30b385673eb4dda1c85a84a9cacf8409cf4ab7
-		name=Upgrade from 0.12
+	; commit=5d26c33b91a98c7e9e830edbd7150a3cc9a1e7dd
+		name=Upgrade from 0.13
 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1
\ No newline at end of file
diff --git a/conf/app-frontend.src b/conf/app-frontend.src
index d54fb90..f73ea8e 100644
--- a/conf/app-frontend.src
+++ b/conf/app-frontend.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/builds/artifacts/0.13/download?job=build_front
-SOURCE_SUM=6b22681951b7e5f2acea84ee8f1767256b723591ddcaf3e526c885ba26335934
+SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/0.14/download?job=build_front
+SOURCE_SUM=74bd307956f0c2f7acb3b34e93d7dd6af65b6ec8b4f285906ceb87922d6e11d6
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
diff --git a/conf/app.src b/conf/app.src
index bb9b41a..2267aa2 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/archive/0.13/funkwhale-0.13.tar.bz2
-SOURCE_SUM=e615fdb072528cac190c6a241ac371dc2f57a5e5ee7ae8788d7b512f39300788
+SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/archive/0.14/funkwhale-0.14.tar.bz2
+SOURCE_SUM=42fab2642345a8e5f0294429116c26f8cfede624148aa61d44517bfd9397507d
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.bz2
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index e2122b6..a49b22f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
 	"description": {
 		"en": "A modern, convivial and free music server"
 	},
-	"version": "0.13.0~ynh1",
+	"version": "0.14.0~ynh1",
 	"url": "https://funkwhale.audio",
 	"license": "BSD-3-Clause",
 	"maintainer": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 08ae00d..0017550 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -26,8 +26,8 @@ ynh_redis_get_free_db() {
 	 	then
 			db=$i
 	 		break 1
-	 		db=-1
  		fi
+ 		db=-1
 	done
 
 	test "$db" -eq -1 && ynh_die "No available Redis databases..."