From 596075d141e3d90a5e274213a7bbab8a6e9d3cb4 Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Fri, 23 Aug 2024 09:21:54 +0200
Subject: [PATCH] set version to 2.2.0 for upcoming release

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 install/froxlor.sql.php                    | 2 +-
 install/updates/froxlor/update_2.2.inc.php | 5 +++++
 lib/Froxlor/Froxlor.php                    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php
index 701cb58812..9c45c5d79f 100644
--- a/install/froxlor.sql.php
+++ b/install/froxlor.sql.php
@@ -730,7 +730,7 @@
 	('panel', 'logo_overridecustom', '0'),
 	('panel', 'settings_mode', '0'),
 	('panel', 'menu_collapsed', '1'),
-	('panel', 'version', '2.2.0-rc3'),
+	('panel', 'version', '2.2.0'),
 	('panel', 'db_version', '202408140');
 
 
diff --git a/install/updates/froxlor/update_2.2.inc.php b/install/updates/froxlor/update_2.2.inc.php
index 27dc4d1581..8dcf41783a 100644
--- a/install/updates/froxlor/update_2.2.inc.php
+++ b/install/updates/froxlor/update_2.2.inc.php
@@ -159,3 +159,8 @@
 
 	Froxlor::updateToDbVersion('202408140');
 }
+
+if (Froxlor::isFroxlorVersion('2.2.0-rc3')) {
+	Update::showUpdateStep("Updating from 2.2.0-rc3 to 2.2.0 stable", false);
+	Froxlor::updateToVersion('2.2.0');
+}
diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php
index 78894a6bb4..907e580751 100644
--- a/lib/Froxlor/Froxlor.php
+++ b/lib/Froxlor/Froxlor.php
@@ -31,7 +31,7 @@ final class Froxlor
 {
 
 	// Main version variable
-	const VERSION = '2.2.0-rc3';
+	const VERSION = '2.2.0';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
 	const DBVERSION = '202408140';