Skip to content

Commit 27f5eb1

Browse files
authored
fix: broken light theme (#136)
Symlinks are not sufficient for this. ``` Path traversal attempt detected: /usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js is not inside /usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/ ``` Technically we don't need ksplashrc to be setting this as the splash screen is part of the theme but I feel like we should still set this in this way as a fallback. fixes: ublue-os/aurora#1984
1 parent 9e8b395 commit 27f5eb1

6 files changed

Lines changed: 15 additions & 3 deletions

File tree

Containerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,25 @@ RUN set -xeuo pipefail && \
6868
curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/busywidget.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/busywidget.svgz && \
6969
curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/kde.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/kde.svgz && \
7070
curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/plasma.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/plasma.svgz && \
71+
mkdir -p /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/splash/images && \
72+
cp -r /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/ && \
7173
mkdir -p /out/logos/usr/share/sddm/themes/01-breeze-aurora/ && \
7274
ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo.svg /out/logos/usr/share/sddm/themes/01-breeze-aurora/default-logo.svg
7375

76+
COPY /system_files/shared /out/system_files/shared
77+
78+
# Copy default dark variant things to light variant so that it is shared
79+
# Effectively are symlinks but we can't do that here because themes can't execute files of other themes
80+
RUN set -xeuo pipefail && \
81+
cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/plasmoidsetupscripts/ /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents && \
82+
cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/ /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents && \
83+
cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/layouts /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents
84+
7485
FROM scratch AS ctx
7586
COPY --from=ghcr.io/projectbluefin/common:latest /system_files/shared /system_files/shared
7687
COPY --from=ghcr.io/projectbluefin/common:latest /system_files/nvidia /system_files/nvidia
7788
COPY --from=builder /out/wallpapers /wallpapers
7889
COPY --from=builder /out/logos /logos
90+
COPY --from=builder /out/system_files/shared /system_files/shared
7991
COPY /branding/system_files /system_files/shared
8092
COPY /system_files /system_files
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[KSplash]
2+
Theme=dev.getaurora.aurora.desktop

system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/plasmoidsetupscripts/org.kde.plasma.systemtray.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/metadata.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"Website": "https://getaurora.dev"
2020
},
2121
"X-KDE-ParentApp": "",
22+
"X-Plasma-RootContainmentLayout": "org.kde.plasma.desktop-layout.js",
2223
"X-Plasma-MainScript": "defaults"
2324
}

0 commit comments

Comments
 (0)