chore: hide gnome-terminal on > 38 (#1188)

ublue-os · Apr 23, 2024 · e670b75 · e670b75
1 parent effadf8
commit e670b75
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/build_files/base/aurora-changes.sh b/build_files/base/aurora-changes.sh
@@ -16,4 +16,7 @@ if [[ "${BASE_IMAGE_NAME}" = "kinoite" ]]; then
     rm -f /usr/share/kglobalaccel/org.kde.konsole.desktop
     rm -f /usr/etc/profile.d/gnome-ssh-askpass.{csh,sh} # This shouldn't be pulled in
     systemctl enable kde-sysmonitor-workaround.service
+    if [[ "$FEDORA_MAJOR_VERSION " -eq "38" ]]; then
+        rm -f /usr/etc/profile.d/aurora-fastfetch.sh
+    fi
 fi
diff --git a/build_files/base/bluefin-changes.sh b/build_files/base/bluefin-changes.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/bash
+
+set -ouex pipefail
+
+if [[ "${BASE_IMAGE_NAME}" = "silverblue" ]]; then
+    if [[ -f /usr/share/applications/gnome-system-monitor.desktop ]]; then
+        sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/gnome-system-monitor.desktop
+    fi
+    if [[ "$FEDORA_MAJOR_VERSION " -eq "38" ]]; then
+        rm -f /usr/etc/profile.d/bluefin-fashfetch.sh
+    else
+        sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.gnome.Terminal.desktop
+    fi
+fi
diff --git a/build_files/base/build-base.sh b/build_files/base/build-base.sh
@@ -13,6 +13,7 @@ set -oue pipefail
 . /tmp/build/font-install.sh
 . /tmp/build/install-tmp.sh
 . /tmp/build/systemd.sh
+. /tmp/build/bluefin-changes.sh
 . /tmp/build/aurora-changes.sh
 . /tmp/build/branding.sh
 . /tmp/build/initramfs.sh

diff --git a/build_files/base/cleanup.sh b/build_files/base/cleanup.sh
@@ -8,14 +8,4 @@ rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo
 sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/fish.desktop
 sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/htop.desktop
 sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/nvtop.desktop
-if [[ "$BASE_IMAGE_NAME" = "silverblue" && -f /usr/share/applications/gnome-system-monitor.desktop ]]; then
-    sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/gnome-system-monitor.desktop
-fi
-if [[ "$FEDORA_MAJOR_VERSION " -eq "38" ]]; then
-    if [[ "$BASE_IMAGE_NAME" == "silverblue" ]]; then
-        rm -f /usr/etc/profile.d/bluefin-fashfetch.sh
-    elif [[ "$BASE_IMAGE_NAME" == "kinoite" ]]; then
-        rm -f /usr/etc/profile.d/aurora-fastfetch.sh
-    fi
-fi
 rm -f /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo