From c04b82b2fa6cb76ede26043b859e3a1028bb3618 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 10 Apr 2024 16:19:55 -0500 Subject: [PATCH] Fix pkgselect for kubuntu and ubuntuunity --- debian/changelog | 7 ++++++ kubuntu/modules/pkgselect_context.conf | 15 +++++++++++++ kubuntu/modules/pkgselect_snap_context.conf | 9 ++++++++ kubuntu/settings.conf | 6 +++++ ubuntuunity/modules/pkgselect_context.conf | 22 +++++++++---------- .../modules/pkgselect_snap_context.conf | 12 +++++----- ubuntuunity/settings.conf | 6 +++++ 7 files changed, 60 insertions(+), 17 deletions(-) create mode 100644 kubuntu/modules/pkgselect_context.conf create mode 100644 kubuntu/modules/pkgselect_snap_context.conf diff --git a/debian/changelog b/debian/changelog index ed739c7..21ef854 100644 --- a/debian/changelog +++ b/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 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. diff --git a/kubuntu/modules/pkgselect_context.conf b/kubuntu/modules/pkgselect_context.conf new file mode 100644 index 0000000..8083c50 --- /dev/null +++ b/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" diff --git a/kubuntu/modules/pkgselect_snap_context.conf b/kubuntu/modules/pkgselect_snap_context.conf new file mode 100644 index 0000000..653de5e --- /dev/null +++ b/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" diff --git a/kubuntu/settings.conf b/kubuntu/settings.conf index 48b8d3c..7a16a67 100644 --- a/kubuntu/settings.conf +++ b/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 diff --git a/ubuntuunity/modules/pkgselect_context.conf b/ubuntuunity/modules/pkgselect_context.conf index c9bc096..9e30b3c 100644 --- a/ubuntuunity/modules/pkgselect_context.conf +++ b/ubuntuunity/modules/pkgselect_context.conf @@ -1,17 +1,15 @@ --- dontChroot: false -timeout: 300 -"packages.minimalInstall": +timeout: 900 +"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" - - "apt-get -y install ubuntu-restricted-addons unrar" -"packages.updateNow": - true: "apt-get -y full-upgrade" -"packages.virt-manager": - true: "apt-get -y install virt-manager" -"packages.thunderbird": - true: "apt-get -y install thunderbird" + - "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" diff --git a/ubuntuunity/modules/pkgselect_snap_context.conf b/ubuntuunity/modules/pkgselect_snap_context.conf index 02b0956..653de5e 100644 --- a/ubuntuunity/modules/pkgselect_snap_context.conf +++ b/ubuntuunity/modules/pkgselect_snap_context.conf @@ -1,7 +1,9 @@ --- dontChroot: true -timeout: 600 -"packages.element": - true: "calamares_snap_install ${ROOT} element-desktop=stable" -"packages.krita": - true: "calamares_snap_install ${ROOT} cups=stable kf5-5-111-qt-5-15-11-core22=stable krita=stable" +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" diff --git a/ubuntuunity/settings.conf b/ubuntuunity/settings.conf index 1adbe1f..a5bcda5 100644 --- a/ubuntuunity/settings.conf +++ b/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