Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: combine Aurora and Bluefin yafti #1119

Merged
merged 5 commits into from
Apr 11, 2024
Merged

chore: combine Aurora and Bluefin yafti #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef1a659
chore: combine Aurora and Bluefin yafti
m2Giles Apr 11, 2024
41c3032
fix: correct yafti path.
m2Giles Apr 11, 2024
7ce2429
fix: yafti file path
m2Giles Apr 11, 2024
2a5f3ca
fix: flatpak manager branding
m2Giles Apr 11, 2024
0a9ba37
Merge branch 'main' into yafti-merge
castrojo Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build_files/base/aurora-changes.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions build_files/base/branding.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions build_files/dx/branding-dx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
92 changes: 0 additions & 92 deletions system_files/kinoite/usr/etc/yafti.yml
View file
Open in desktop

This file was deleted.

0 system_files/silverblue/usr/etc/yafti.yml → system_files/shared/usr/etc/yafti.yml
View file
Open in desktop
File renamed without changes.
Loading