chore: combine Aurora and Bluefin yafti (#1119)

Co-authored-by: Jorge O. Castro <[email protected]>
ublue-os · Apr 11, 2024 · 30eb337 · 30eb337
1 parent 44d0e40
commit 30eb337
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 94 deletions.
diff --git a/build_files/base/aurora-changes.sh b/build_files/base/aurora-changes.sh
@@ -2,10 +2,10 @@
 
 set -oue pipefail
 
-if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" && "${BASE_IMAGE_NAME}" = "kinoite" ]]; then
+if [[ "${BASE_IMAGE_NAME}" = "kinoite" ]]; then
     sed -i '/<entry name="launchers" type="StringList">/,/<\/entry>/ s/<default>[^<]*<\/default>/<default>preferred:\/\/browser,applications:org.gnome.Ptyxis.desktop,applications:org.kde.discover.desktop,preferred:\/\/filemanager<\/default>/' /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml
     sed -i '/<entry name="favorites" type="StringList">/,/<\/entry>/ s/<default>[^<]*<\/default>/<default>preferred:\/\/browser,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.kate.desktop,org.gnome.Ptyxis.desktop,org.kde.discover.desktop<\/default>/' /usr/share/plasma/plasmoids/org.kde.plasma.kickoff/contents/config/main.xml
     sed -i 's@Exec=ptyxis@Exec=kde-ptyxis@g' /usr/share/applications/org.gnome.Ptyxis.desktop
     sed -i 's@Keywords=@Keywords=konsole;@g' /usr/share/applications/org.gnome.Ptyxis.desktop
     cp /usr/share/applications/org.gnome.Ptyxis.desktop /usr/share/kglobalaccel/org.gnome.Ptyxis.desktop
-fi
+fi
diff --git a/build_files/base/branding.sh b/build_files/base/branding.sh
@@ -6,4 +6,7 @@ if test "$BASE_IMAGE_NAME" = "silverblue"; then
     sed -i '/^PRETTY_NAME/s/Silverblue/Bluefin/' /usr/lib/os-release
 elif test "$BASE_IMAGE_NAME" = "kinoite"; then
     sed -i '/^PRETTY_NAME/s/Kinoite/Aurora/' /usr/lib/os-release
+    sed -i 's/Bluefin/Aurora/g' /usr/etc/yafti.yml
+    sed -i 's/Aurora (Beta)/Aurora \- Bluefin\-KDE (Alpha)/' /usr/etc/yafti.yml
+    sed -i 's/Bluefin/Aurora/' /usr/libexec/ublue-flatpak-manager
 fi
diff --git a/build_files/dx/branding-dx.sh b/build_files/dx/branding-dx.sh
@@ -4,6 +4,8 @@ set -oue pipefail
 
 if test "$BASE_IMAGE_NAME" = "silverblue"; then
     sed -i '/^PRETTY_NAME/s/Bluefin/Bluefin-dx/' /usr/lib/os-release
+    sed -i 's/Bluefin/Bluefin-dx/' /usr/etc/yafti.yml
 elif test "$BASE_IMAGE_NAME" = "kinoite"; then
     sed -i '/^PRETTY_NAME/s/Aurora/Aurora-dx/' /usr/lib/os-release
+    sed -i 's/Aurora/Aurora-dx/' /usr/etc/yafti.yml
 fi
diff --git a/system_files/kinoite/usr/etc/yafti.yml b/system_files/kinoite/usr/etc/yafti.yml
diff --git a/system_files/silverblue/usr/etc/yafti.yml → system_files/shared/usr/etc/yafti.yml b/system_files/silverblue/usr/etc/yafti.yml → system_files/shared/usr/etc/yafti.yml