Repository navigation
Refactor packaging: fix PKGBUILD bugs, move config into the tree, clean up wallpapers and CI - #13
Merged
Merged
Conversation
-iname only looks at the basename, so resources/logos/unios.png got past the *logo* filter and ended up in the wallpaper pack. Only search resources/wallpapers instead.
Nothing points at unios.jpg, it was just a second copy of whichever image find returned first, so another 5MB in the package for nothing.
breeze-dark ships its own start-here-kde, so the copies in hicolor never got picked up, and the scalable one was a PNG in a directory meant for SVGs. Kickoff defaults to start-here-kde-symbolic on Plasma 6 anyway, and the setup script already points the launcher at our logo.
- The setup script calls qdbus6, which comes from qt6-tools. We only had it because plasma-workspace happens to pull it in - kdeglobals and mimeapps.list make Firefox the default browser, so list it as an optdepend
publish_to_PPA.yml calls dpkg-parsechangelog, but debian/ is gone since the move to Arch, so every v* tag either failed or skipped. Ignore the makepkg output instead of the old debhelper files.
The config files and the setup script are about to become real files in the repo, and a CRLF shebang or desktop entry from a Windows checkout would break them on Arch.
- Everything package() used to write with heredocs now lives under files/, laid out like the paths it installs to, so it can be read, diffed and linted like any other file. An unterminated heredoc already shipped a broken autostart entry once - Drop the RES_DIR guessing between three paths. makepkg runs from the checkout, so the files are always next to the PKGBUILD - The installed files are byte for byte the same, apart from the two comments that moved from the PKGBUILD into kded5rc and plasma-welcomerc
- plasma-apply-wallpaperimage sends the same evaluateScript we run right before it, so the wallpaper was being set twice. Drop it - org.kde.plasma.appmenu is the global menu, not a launcher, it has no icon to set - Quote the qdbus binary and stop naming the loop variable nobody uses (shellcheck SC2034)
It reset the wallpaper and the launcher icon on every login, so nobody could change either of them. Leave a marker in ~/.local/state/unios after the first run that plasmashell actually accepted and skip the script from then on. If Plasma never answers, nothing is written and the next login tries again.
On any other desktop it just waited 15 seconds for a plasmashell that was never going to answer.
Plasma treats every image in contents/images as a different resolution of the same wallpaper and picks one by its WxH file name. Ours were called default.jpg and so on, so nothing matched: the UniOS Wallpapers entry had no image to show and the patterns could never be picked on their own. - UniOS, UniOS Patterns and UniOS Dense Patterns are separate packages under resources/wallpapers, installed as they are - Images are named after their resolution - The setup script points at the UniOS package instead of a file inside it, so Plasma picks the right size by itself
All three were 8001x4501. 3840x2160 is plenty for a wallpaper and takes them from 11.5MB down to 3.2MB, which is also what every rebuild adds to unios-pkgs. The default is still CMYK with its SWOP profile. It's only resized, no colour conversion, so it looks exactly like before in every app.
Without a backup array pacman overwrote kdeglobals and the rest on every update, so a machine-wide change, like a lab setting a different browser, was gone after the next -Syu. An edited file now stays put and the new one lands next to it as .pacnew.
Replaces the PPA job with one that actually matches how we ship now. On every push and PR to main it checks the setup script with shellcheck, the autostart entry with desktop-file-validate and the wallpaper metadata with jq, then builds the package with makepkg in an archlinux container. namcap runs on the result but only reports, since it can't see qdbus6 being called and complains about deps like that.
It still called this the package of our PPA. Say what it installs, how the repo is laid out, and how to build it, add a wallpaper and release.
The logo goes into hicolor/256x256/apps, and namcap flags it as an error in CI (Dependency hicolor-icon-theme detected and not included). We only had it because plasma-workspace pulls it in.
Set #ae73a6 as the accent in the kdeglobals defaults, so highlights, selections, focus rings and links pick it up on top of Breeze Dark instead of the stock blue. LastUsedCustomAccentColor is set too, so the color settings page shows it as the custom color.
Member
Author
|
Tested with build-test-iso.sh:
This is ready to get merged |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This is the refactor from #9. The package keeps the same defaults (Breeze Dark, Firefox, no Welcome Center), but it stops shipping broken or unused files, users can finally change their wallpaper, and the config lives in real files instead of heredocs in the
PKGBUILD.Closes #9
Changes
-inameonly matches the basename, soresources/logos/unios.pnggot past the*logo*filterunios.jpgcopy of the first wallpaper, nothing used itstart-here-kdeicons: breeze-dark ships its own, and the scalable one was a PNG.distributor-logostays, breeze-dark doesn't have oneqt6-toolsindependsforqdbus6andhicolor-icon-themefor the logo in the hicolor theme (namcap error),firefoxinoptdependspublish_to_PPA.yml(there's nodebian/anymore) and the debhelper entries in.gitignorepackage()used to write with heredocs is now underfiles/, laid out like the paths it installs to. No moreRES_DIRguessing, makepkg runs from the checkout. The installed files are the same byte for byte, apart from two comments that moved intokded5rcandplasma-welcomerc~/.local/state/unios/plasma-setup.done) is only written once plasmashell actually ran the script, so a failed login gets another tryplasma-apply-wallpaperimagesent the sameevaluateScriptagain) and no longer touches the global menu appletOnlyShowIn=KDE;, so it doesn't wait 15 seconds for plasmashell on other desktopsWxHfile name, so the old single pack had no usable image and the patterns could never be pickedbackupfor the five/etc/xdgfiles, so local edits survive upgrades and the new version lands as.pacnewarchlinuxcontainer after shellcheck, desktop-file-validate and jq. namcap runs too but only reportspkgrel10 → 11The installed package goes from 16MB to 3.2MB.
Notes for reviewers
debian/rules, which is gone. No tagged source either: there's nov1.0.0tag and the build server builds from the checkout, same as UniDesk and UniNewsunios-repokded5rc(Module-kded_plasma_welcome) andplasma-welcomerc(LastSeenVersion,ShowUpdatePage) are checked against the kded and plasma-welcome sources, those are the keys they readdefault.jpgpath is gone, then never againunios-desktop-settings.md) still describes the old layout and needs updating after this is mergedTesting
archlinuxcontainer and passes. namcap only warns about dependencies it can't see being used (breeze,plasma-workspace,qt6-tools...) and aboutbashpackage()the way makepkg does (set -e) at every commit and diffed the installed filesshellcheckis clean and the wallpaper metadata is valid JSONqdbus6: first login, second login, plasmashell failing, no qdbustest.shon the build server