base-files: symlink upstream distro logos to Armbian's#9688
base-files: symlink upstream distro logos to Armbian's#9688igorpecovnik merged 2 commits intomainfrom
Conversation
|
Important Review skippedAuto reviews are limited based on label configuration. 🏷️ Required labels (at least one) (1)
Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
📝 WalkthroughWalkthroughThe build step Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Poem
🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@lib/functions/artifacts/artifact-armbian-base-files.sh`:
- Around line 171-191: This block guarded by [[ -d
"${destination}/usr/share/pixmaps" ]] is dead code and should be removed; if you
must keep it for future-proofing, change the logic in the for-loop that
currently always attempts rm/ln on ubuntu-logo* to first check whether the
specific upstream file exists before touching it (i.e. test -f "${upstream}"
before rm -f/ln -sf), and mirror the debian check pattern for ubuntu-logo so we
only replace files present in the base-files payload (refer to the loop using
suffix, the upstream variable
upstream="${destination}/usr/share/pixmaps/ubuntu-logo${suffix}", and
debian_variant="${destination}/usr/share/pixmaps/debian-logo${suffix}").
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 22abd396-6afc-4def-80bd-fd2e2829637e
📒 Files selected for processing (1)
lib/functions/artifacts/artifact-armbian-base-files.sh
15d0247 to
ad826dc
Compare
Ubuntu hardcodes lookups for ubuntu-logo.svg, ubuntu-logo-text.png, and ubuntu-logo-text-dark.png in GNOME Settings -> About and other places. LOGO=armbian-logo in os-release only helps apps that use the icon-spec lookup; the rest reference the filenames directly. Since we repack base-files as our own, replace the upstream files with relative symlinks pointing at the Armbian equivalents (armbian-logo.svg, armbian-logo-text.png, armbian-logo-text-dark.png) which are shipped by armbian-bsp-cli via packages/bsp/common/usr/ share/pixmaps/. Also handles debian-logo variants if present. Result: every panel that references ubuntu-logo* by filename now renders the Armbian logo without needing to know about the LOGO= os-release field.
ad826dc to
4eff4f0
Compare
SVG wordmark variants matching the newer Ubuntu base-files layout (resolute ships ubuntu-logo-text.svg and ubuntu-logo-text-dark.svg alongside the PNG versions). The base-files symlinks from the previous commit point at these files.
Summary
Ubuntu hardcodes lookups for
ubuntu-logo.svg,ubuntu-logo-text.png,ubuntu-logo-text-dark.png, and newer SVG text variants by filename in GNOME Settings → About and other panels. TheLOGO=armbian-logofield in/etc/os-releaseonly helps apps that use the freedesktop icon-spec lookup; the rest reference the filenames directly.Since we repack
base-filesas our own, replace the upstream files with relative symlinks:The Armbian logo files are shipped by
armbian-bsp-cli(PR #9674) at the same/usr/share/pixmaps/path.Test plan
ls -la /usr/share/pixmaps/ubuntu-logo*— all are symlinks toarmbian-logo*Summary by CodeRabbit