From ed7247c86cfdeaa91f9d8be444a3b49daa21cb85 Mon Sep 17 00:00:00 2001
From: Uri Herrera <hello@uriherrera.com>
Date: Thu, 18 Jul 2024 16:07:28 -0600
Subject: [PATCH] update pkg

---
 debian/changelog                            |  6 ++++++
 etc/calamares/branding/nxos/branding.desc   |  8 ++++----
 etc/skel/Desktop/org.nxos.installer.desktop |  2 +-
 usr/bin/start-calamares                     | 10 +++++-----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1ff796..47d73cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+calamares-qml-settings-nitrux (1.7.4+new-dev) nitrux; urgency=medium
+
+  * Update branding.
+
+ -- Uri Herrera <uri_herrera@nxos.org>  Thu, 18 Jun 2024 16:07:00 -0500
+
 calamares-qml-settings-nitrux (1.7.3+new-dev) nitrux; urgency=medium
 
   * Remove grub parameter.
diff --git a/etc/calamares/branding/nxos/branding.desc b/etc/calamares/branding/nxos/branding.desc
index 607d957..e753e45 100644
--- a/etc/calamares/branding/nxos/branding.desc
+++ b/etc/calamares/branding/nxos/branding.desc
@@ -15,10 +15,10 @@ welcomeExpandingLogo:   true
 strings:
     productName:         Nitrux OS
     shortProductName:    Nitrux
-    version:             3.5.1
-    shortVersion:        3.5.1
-    versionedName:       Nitrux OS 3.5.1 build.300624.nm
-    shortVersionedName:  Nitrux 3.5.1 build.300624.nm
+    version:             3.6.0
+    shortVersion:        3.6.0
+    versionedName:       Nitrux OS 3.6.0 build.310724.xx
+    shortVersionedName:  Nitrux 3.6.0 build.310724.xx
     bootloaderEntryName: Nitrux
     productUrl:          https://nxos.org/
     supportUrl:          https://github.com/Nitrux/nitrux-bug-tracker/
diff --git a/etc/skel/Desktop/org.nxos.installer.desktop b/etc/skel/Desktop/org.nxos.installer.desktop
index 314a9f3..4b0e2c1 100755
--- a/etc/skel/Desktop/org.nxos.installer.desktop
+++ b/etc/skel/Desktop/org.nxos.installer.desktop
@@ -2,7 +2,7 @@
 Categories=Qt;System;
 Comment[en_US]=Install Nitrux OS in this computer.
 Comment=Install Nitrux OS in this computer.
-Exec=start-calamares
+Exec=sudo -E start-calamares
 GenericName[en_US]=Installer
 GenericName=Installer
 Icon=live-installer
diff --git a/usr/bin/start-calamares b/usr/bin/start-calamares
index 6910368..6c94ab9 100755
--- a/usr/bin/start-calamares
+++ b/usr/bin/start-calamares
@@ -63,15 +63,15 @@ puts_error() {
 # -- Unmount swap before starting Calamres; otherwise, Calamares can't partition disks when running in a VM. I do not know why swap is automatically mounted *ONLY* in Live sessions in VMs.
 
 if swapon --show | grep -q '/dev/'; then
-    puts_info "Swap partition is currently mounted. Unmounting..."
-    sudo swapoff -a
-    puts_success "Swap partition has been unmounted."
+    puts_info "SWAP partition is currently mounted. Unmounting..."
+    swapoff -a
+    puts_success "SWAP partition has been unmounted."
 else
-    puts_error "Swap partition is not mounted."
+    puts_error "SWAP partition is not mounted."
 fi
 
 
 # -- Launch Calamares.
 
 puts_info "Starting Calamares..."
-sudo -E calamares -D6
+calamares -D6