Fix pkgselect for kubuntu and ubuntuunity

debian/changelog

@@ -1,3 +1,10 @@
+calamares-settings-ubuntu (1:24.04.26) noble; urgency=medium
+
+  * Make the pkgselect module actually work on Kubuntu and Ubuntu Unity.
+    (LP: #2060879)
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Wed, 10 Apr 2024 16:16:21 -0500
+
 calamares-settings-ubuntu (1:24.04.25) noble; urgency=medium
 
   * Be completely sure apt will not try to prompt the user.

kubuntu/modules/pkgselect_context.conf

@@ -0,0 +1,15 @@
+---
+dontChroot: false
+timeout: 900
+"packages.minimalButton":
+    true:
+        - "DEBIAN_FRONTEND=noninteractive apt-get -y --purge remove kmahjongg kmines kpat ksudoku skanlite skanpage okular libreoffice* kdeconnect krdc konversation neochat elisa haruna vim snapd partitionmanager usb-creator* plasma-welcome kde-config-tablet plasma-welcome"
+        - "apt-get -y autoremove"
+"packages.partyButton":
+    true:
+        - "DEBIAN_FRONTEND=noninteractive apt-get update"
+        - "DEBIAN_FRONTEND=noninteractive apt-get -y install ubuntu-restricted-addons unrar"
+"packages.updatesButton":
+    true: "DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::='--force-confnew' full-upgrade"
+"packages.virtmanagerButton":
+    true: "DEBIAN_FRONTEND=noninteractive apt-get -y install virt-manager"

kubuntu/modules/pkgselect_snap_context.conf

@@ -0,0 +1,9 @@
+---
+dontChroot: true
+timeout: 900
+"packages.elementButton":
+    true: "snap-seed-glue --seed ${ROOT}/var/lib/snapd/seed element-desktop"
+"packages.kritaButton":
+    true: "snap-seed-glue --seed ${ROOT}/var/lib/snapd/seed krita"
+"packages.thunderbirdButton":
+    true: "snap-seed-glue --seed ${ROOT}/var/lib/snapd/seed thunderbird"

kubuntu/settings.conf

@@ -20,6 +20,12 @@ instances:
 - id: add386arch
   module: shellprocess
   config: shellprocess_add386arch.conf
+- id: pkgselect_action
+  module: contextualprocess
+  config: pkgselect_context.conf
+- id: pkgselect_snap_action
+  module: contextualprocess
+  config: pkgselect_snap_context.conf
 - id: oemprep
   module: shellprocess
   config: shellprocess_oemprep.conf

ubuntuunity/modules/pkgselect_context.conf

@@ -1,17 +1,15 @@
 ---
 dontChroot: false
-timeout: 300
+timeout: 900
-"packages.minimalInstall":
+"packages.minimalButton":
     true:
-        - "apt-get -y --purge remove snapd vlc plasma-discover transmission-qt quassel 2048-qt featherpad noblenote kcalc qps zsync partitionmanager qapt-deb-installer picom qlipper qtpass libreoffice*"
+        - "DEBIAN_FRONTEND=noninteractive apt-get -y --purge remove snapd aisleriot atril cheese simple-scan gdebi gparted *kvantum* libreoffice* gnome-mahjongg gnome-mines remmina rhythmbox shotwell gnome-sudoku synaptic transmission-gtk vlc stacer"
         - "apt-get -y autoremove"
-"packages.restrictedExtras":
+"packages.partyButton":
     true:
-        - "apt-get update"
+        - "DEBIAN_FRONTEND=noninteractive apt-get update"
-        - "apt-get -y install ubuntu-restricted-addons unrar"
+        - "DEBIAN_FRONTEND=noninteractive apt-get -y install ubuntu-restricted-addons unrar"
-"packages.updateNow":
+"packages.updatesButton":
-    true: "apt-get -y full-upgrade"
+    true: "DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::='--force-confnew' full-upgrade"
-"packages.virt-manager":
+"packages.virtmanagerButton":
-    true: "apt-get -y install virt-manager"
+    true: "DEBIAN_FRONTEND=noninteractive apt-get -y install virt-manager"
-"packages.thunderbird":
-    true: "apt-get -y install thunderbird"

ubuntuunity/modules/pkgselect_snap_context.conf

@@ -1,7 +1,9 @@
 ---
 dontChroot: true
-timeout: 600
+timeout: 900
-"packages.element":
+"packages.elementButton":
-    true: "calamares_snap_install ${ROOT} element-desktop=stable"
+    true: "snap-seed-glue --seed ${ROOT}/var/lib/snapd/seed element-desktop"
-"packages.krita":
+"packages.kritaButton":
-    true: "calamares_snap_install ${ROOT} cups=stable kf5-5-111-qt-5-15-11-core22=stable krita=stable"
+    true: "snap-seed-glue --seed ${ROOT}/var/lib/snapd/seed krita"
+"packages.thunderbirdButton":
+    true: "snap-seed-glue --seed ${ROOT}/var/lib/snapd/seed thunderbird"

ubuntuunity/settings.conf

@@ -20,6 +20,12 @@ instances:
 - id: add386arch
   module: shellprocess
   config: shellprocess_add386arch.conf
+- id: pkgselect_action
+  module: contextualprocess
+  config: pkgselect_context.conf
+- id: pkgselect_snap_action
+  module: contextualprocess
+  config: pkgselect_snap_context.conf
 - id: oemprep
   module: shellprocess
   config: shellprocess_oemprep.conf