From b9ed0e1e2c9dce4f06f3844da766e9e215c783c6 Mon Sep 17 00:00:00 2001
From: debianpepper <pdpdebdevuan@protonmail.com>
Date: Thu, 23 May 2024 21:44:39 +0900
Subject: [PATCH] Updated: Calamres branding

Signed-off-by: debianpepper <pdpdebdevuan@protonmail.com>
---
 .../panel/launcher-17/16158061764.desktop     |  9 ------
 python_modules/infra.py                       | 32 +++++++++----------
 2 files changed, 16 insertions(+), 25 deletions(-)
 delete mode 100755 iso_configs/xfce/xfce4/panel/launcher-17/16158061764.desktop

diff --git a/iso_configs/xfce/xfce4/panel/launcher-17/16158061764.desktop b/iso_configs/xfce/xfce4/panel/launcher-17/16158061764.desktop
deleted file mode 100755
index bd7eb898..00000000
--- a/iso_configs/xfce/xfce4/panel/launcher-17/16158061764.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Peppermint Hub
-Comment=This will open the Pep Hub
-Exec=hub
-Icon=peppermint-hub-128
-Terminal=false
-StartupNotify=false
diff --git a/python_modules/infra.py b/python_modules/infra.py
index c599f2cf..e8bc126e 100644
--- a/python_modules/infra.py
+++ b/python_modules/infra.py
@@ -260,25 +260,25 @@ class ArchitectureFiles:
         self.sarch = sarch
         calamares_path = '/calamares_settings/'
         sources_path = '/sources/'
-        src_paths = (#calamares_path + self.sbase + self.sarch +
-                     #'/calamares/settings.conf',
-                     #calamares_path + self.sbase + self.sarch +
-                     #'/install-peppermint',
-                     #calamares_path + self.sbase + self.sarch +
-                     #'/sources-final',
-                     #calamares_path + self.sbase + self.sarch +
-                     #'/bootloader-config',
-                     #calamares_path +
-                     #'adddesktopicon/add-calamares-desktop-icon',
+        src_paths = (calamares_path + self.sbase + self.sarch +
+                     '/calamares/settings.conf',
+                     calamares_path + self.sbase + self.sarch +
+                     '/install-peppermint',
+                     calamares_path + self.sbase + self.sarch +
+                     '/sources-final',
+                     calamares_path + self.sbase + self.sarch +
+                     '/bootloader-config',
+                     calamares_path +
+                     'adddesktopicon/add-calamares-desktop-icon',
                      sources_path + self.sbase + self.sarch +
                      '/sources.list', 
-                     #'/id_files/pep_id'
+                     '/id_files/pep_id'
                       )
-        des_paths = (#'/etc/calamares/settings.conf',
-                     #'/usr/bin/install-peppermint',
-                     #'/usr/sbin/sources-final',
-                     #'/usr/sbin/bootloader-config',
-                     #'/usr/bin/add-calamares-desktop-icon',
+        des_paths = ('/etc/calamares/settings.conf',
+                     '/usr/bin/install-peppermint',
+                     '/usr/sbin/sources-final',
+                     '/usr/sbin/bootloader-config',
+                     '/usr/bin/add-calamares-desktop-icon',
                      '/opt/pepconf/sources.list',
                      '/usr/share/peppermint/pep_id'
                       )