From e9855d2b7972e41e3af280b11c903ce9ab7f093f Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sun, 18 Aug 2024 09:06:01 +0100 Subject: [PATCH 1/5] fix: exclude gnome packages which should be flatpaks --- scripts/_base/001-desktop-environment.sh | 82 +++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/scripts/_base/001-desktop-environment.sh b/scripts/_base/001-desktop-environment.sh index b24ffcd..9852e8b 100644 --- a/scripts/_base/001-desktop-environment.sh +++ b/scripts/_base/001-desktop-environment.sh @@ -2,5 +2,85 @@ set -euox pipefail + # # Non-critical apps -> Flatpak + # - baobab + # - cheese + # - snapshot + # - evince + # - evince-djvu + # - evince-nautilus + # - file-roller + # - file-roller-nautilus + # - gnome-boxes + # - gnome-calculator + # - gnome-calendar + # - gnome-characters + # - gnome-clocks + # - gnome-connections + # - gnome-contacts + # - gnome-documents + # - gnome-font-viewer + # - gnome-logs + # - gnome-maps + # - gnome-photos + # - gnome-screenshot + # - gnome-text-editor + # - gnome-weather + # - jwhois + # - loupe + # - rdist + # - sane-backends-drivers-scanners + # - simple-scan + # - sushi + # - symlinks + # - tcpdump + # - telnet + # - totem + # - totem-nautilus + # - traceroute + + +excludes=( + "baobab" + "cheese" + "evince" + "evince-djvu" + "evince-nautilus" + "file-roller" + "file-roller-nautilus" + "gnome-boxes" + "gnome-calculator" + "gnome-calendar" + "gnome-characters" + "gnome-clocks" + "gnome-connections" + "gnome-contacts" + "gnome-documents" + "gnome-font-viewer" + "gnome-logs" + "gnome-maps" + "gnome-photos" + "gnome-screenshot" + "gnome-text-editor" + "gnome-weather" + "jwhois" + "loupe" + "rdist" + "sane-backends-drivers-scanners" + "simple-scan" + "snapshot" + "sushi" + "symlinks" + "tcpdump" + "telnet" + "totem" + "totem-nautilus" + "traceroute" +) + +# Make excludes a comma-separated string +excludes=$(IFS=, ; echo "${excludes[*]}") + # Install the base-graphical meta-package -dnf install -y @base-graphical +dnf install -y @base-graphical \ + --exclude "${excludes}" From dfe11dc1116b638ff50517a0cd2d0552b52e3967 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sun, 18 Aug 2024 09:11:03 +0100 Subject: [PATCH 2/5] fix: move excludes to gnome install --- scripts/_base/001-desktop-environment.sh | 76 +------------------ .../_silverblue/001-desktop-environment.sh | 41 +++++++++- 2 files changed, 41 insertions(+), 76 deletions(-) diff --git a/scripts/_base/001-desktop-environment.sh b/scripts/_base/001-desktop-environment.sh index 9852e8b..73c4c96 100644 --- a/scripts/_base/001-desktop-environment.sh +++ b/scripts/_base/001-desktop-environment.sh @@ -2,81 +2,7 @@ set -euox pipefail - # # Non-critical apps -> Flatpak - # - baobab - # - cheese - # - snapshot - # - evince - # - evince-djvu - # - evince-nautilus - # - file-roller - # - file-roller-nautilus - # - gnome-boxes - # - gnome-calculator - # - gnome-calendar - # - gnome-characters - # - gnome-clocks - # - gnome-connections - # - gnome-contacts - # - gnome-documents - # - gnome-font-viewer - # - gnome-logs - # - gnome-maps - # - gnome-photos - # - gnome-screenshot - # - gnome-text-editor - # - gnome-weather - # - jwhois - # - loupe - # - rdist - # - sane-backends-drivers-scanners - # - simple-scan - # - sushi - # - symlinks - # - tcpdump - # - telnet - # - totem - # - totem-nautilus - # - traceroute - - -excludes=( - "baobab" - "cheese" - "evince" - "evince-djvu" - "evince-nautilus" - "file-roller" - "file-roller-nautilus" - "gnome-boxes" - "gnome-calculator" - "gnome-calendar" - "gnome-characters" - "gnome-clocks" - "gnome-connections" - "gnome-contacts" - "gnome-documents" - "gnome-font-viewer" - "gnome-logs" - "gnome-maps" - "gnome-photos" - "gnome-screenshot" - "gnome-text-editor" - "gnome-weather" - "jwhois" - "loupe" - "rdist" - "sane-backends-drivers-scanners" - "simple-scan" - "snapshot" - "sushi" - "symlinks" - "tcpdump" - "telnet" - "totem" - "totem-nautilus" - "traceroute" -) +excludes=() # Make excludes a comma-separated string excludes=$(IFS=, ; echo "${excludes[*]}") diff --git a/scripts/_silverblue/001-desktop-environment.sh b/scripts/_silverblue/001-desktop-environment.sh index 4e157a9..4555511 100644 --- a/scripts/_silverblue/001-desktop-environment.sh +++ b/scripts/_silverblue/001-desktop-environment.sh @@ -3,5 +3,44 @@ set -euox pipefail # Install the desktop environment -dnf install -y @gnome-desktop +excludes=( + + "baobab" + "cheese" + "evince" + "evince-djvu" + "evince-nautilus" + "file-roller" + "file-roller-nautilus" + "gnome-boxes" + "gnome-calculator" + "gnome-calendar" + "gnome-characters" + "gnome-clocks" + "gnome-connections" + "gnome-contacts" + "gnome-documents" + "gnome-font-viewer" + "gnome-logs" + "gnome-maps" + "gnome-photos" + "gnome-screenshot" + "gnome-text-editor" + "gnome-weather" + "jwhois" + "loupe" + "rdist" + "sane-backends-drivers-scanners" + "simple-scan" + "snapshot" + "sushi" + "symlinks" + "tcpdump" + "telnet" + "totem" + "totem-nautilus" + "traceroute" +) + +dnf install -y @gnome-desktop --exclude "${excludes[*]}" systemctl enable gdm.service From ab9e1b248a224216cdbe24dfc4b6bd9a653108d7 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sun, 18 Aug 2024 09:18:11 +0100 Subject: [PATCH 3/5] fix: exclude packagekit --- scripts/_silverblue/001-desktop-environment.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/_silverblue/001-desktop-environment.sh b/scripts/_silverblue/001-desktop-environment.sh index 4555511..e619286 100644 --- a/scripts/_silverblue/001-desktop-environment.sh +++ b/scripts/_silverblue/001-desktop-environment.sh @@ -4,7 +4,6 @@ set -euox pipefail # Install the desktop environment excludes=( - "baobab" "cheese" "evince" @@ -40,6 +39,8 @@ excludes=( "totem" "totem-nautilus" "traceroute" + + "packagekit*" ) dnf install -y @gnome-desktop --exclude "${excludes[*]}" From 7f7c329c73d9292d190526f8e7d2df0c7e2f1e6f Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sun, 18 Aug 2024 09:21:27 +0100 Subject: [PATCH 4/5] fix: packagekit name --- scripts/_silverblue/001-desktop-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_silverblue/001-desktop-environment.sh b/scripts/_silverblue/001-desktop-environment.sh index e619286..379786d 100644 --- a/scripts/_silverblue/001-desktop-environment.sh +++ b/scripts/_silverblue/001-desktop-environment.sh @@ -40,7 +40,7 @@ excludes=( "totem-nautilus" "traceroute" - "packagekit*" + "PackageKit*" ) dnf install -y @gnome-desktop --exclude "${excludes[*]}" From 3df6ad9759df4be42ed7e8fb6f885262141f0788 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sun, 18 Aug 2024 09:24:59 +0100 Subject: [PATCH 5/5] fix: skip broken package installs --- scripts/_silverblue/001-desktop-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_silverblue/001-desktop-environment.sh b/scripts/_silverblue/001-desktop-environment.sh index 379786d..37d31c2 100644 --- a/scripts/_silverblue/001-desktop-environment.sh +++ b/scripts/_silverblue/001-desktop-environment.sh @@ -43,5 +43,5 @@ excludes=( "PackageKit*" ) -dnf install -y @gnome-desktop --exclude "${excludes[*]}" +dnf install -y @gnome-desktop --exclude "${excludes[*]}" --skip-broken systemctl enable gdm.service