From 87db63ca55121f8c37428b0c87054127f1b7c05f Mon Sep 17 00:00:00 2001
From: KF-Art <https://github.com/KF-Art>
Date: Sat, 1 Oct 2022 17:00:02 -0400
Subject: [PATCH] Update calamares postcfg module

---
 .../files/modules/postcfg/main.py                   | 13 +++++++++----
 srcpkgs/calamares-modules-cereus/template           |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/calamares-modules-cereus/files/modules/postcfg/main.py b/srcpkgs/calamares-modules-cereus/files/modules/postcfg/main.py
index ab35bbe..09fe4b9 100644
--- a/srcpkgs/calamares-modules-cereus/files/modules/postcfg/main.py
+++ b/srcpkgs/calamares-modules-cereus/files/modules/postcfg/main.py
@@ -66,10 +66,8 @@ class ConfigController:
         if exists(join(self.root, "usr/sbin/void-installer")):
             target_env_call(["rm", "-f", "usr/sbin/void-installer"])
 
-        if exists(join(self.root, "usr/bin/startplasma-x11")):
-            print("Not removing Breeze")
-        else:
-            self.remove_pkg("breeze")
+        if exists(join(self.root, "usr/sbin/cereus-installer")):
+            target_env_call(["rm", "-f", "usr/sbin/cereus-installer"])
 
         # Initialize package manager databases
         if libcalamares.globalstorage.value("hasInternet"):
@@ -94,6 +92,13 @@ class ConfigController:
         # Enable plymouth
         target_env_call(["plymouth-set-default-theme", "-R", "cereus_simply"])
 
+        # Replace /etc/issue msg from live
+        if exists(join(self.root, "etc/issue.new")):
+            target_env_call(["mv", "etc/issue.new", "etc/issue"])
+
+        # Reconfigure all target packages to ensure everything is ok
+        target_env_call(["xbps-reconfigure", "-fa"])
+
 def run():
     """ Misc postinstall configurations """
 
diff --git a/srcpkgs/calamares-modules-cereus/template b/srcpkgs/calamares-modules-cereus/template
index 08e0692..1951692 100644
--- a/srcpkgs/calamares-modules-cereus/template
+++ b/srcpkgs/calamares-modules-cereus/template
@@ -1,13 +1,13 @@
 # Template file for 'calamares-modules-cereus'
 pkgname=calamares-modules-cereus
-version=2022.08.18
+version=2022.09.22
 revision=1
 modules_dir="usr/lib/calamares/modules/"
 repository="cereus-core"
 short_desc="Additional Cereus modules for Calamares installer"
 maintainer="Kevin F. <https://github.com/KF-Art>"
 license="GPL-3.0"
-homepage="https://cereus-linux.sourceforge.io"
+homepage="https://cereuslinuxproject.github.io"
 
 do_install() {
     vmkdir ${modules_dir}