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

Desktop meta: strip ${SNAP} from .desktop icon #2541

Merged
merged 12 commits into from
May 10, 2019
Merged

Desktop meta: strip ${SNAP} from .desktop icon #2541

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bd76ae5
Appstream: strip ${SNAP} from .desktop icon
Apr 24, 2019
904ccfb
Appstream: Add `${SNAP}` icon path prefix test
Apr 24, 2019
f082634
Appstream tests: Fix the ${SNAP} prefix test
Apr 24, 2019
4e56055
Appstream: Tests show ${SNAP} prefix not stripped
May 1, 2019
7331a0a
Appstream: Ensure icon path is absolute
May 1, 2019
1c78a6a
Merge branch 'master' into appstream-icons
sergiusens May 9, 2019
a5a3d31
Update snapcraft/extractors/appstream.py
May 9, 2019
3d03f7d
Appstream: Update test to correct snap prefix 🤞
May 9, 2019
1023d55
Appstream: Passing tests now
May 10, 2019
3cb090d
Desktop-meta: Allow ${SNAP} prefix on icons
May 10, 2019
640c355
Desktop meta: Fix accidental changes
May 10, 2019
f01b3cf
Desktop meta: Fix code smell from static tests
May 10, 2019
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
5 changes: 5 additions & 0 deletions snapcraft/extractors/appstream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ def _get_icon_from_desktop_file(
entry = DesktopEntry()
entry.parse(os.path.join(workdir, path))
icon = entry.getIcon()

lucyllewy marked this conversation as resolved.
Show resolved Hide resolved
if icon.startswith(r"${SNAP}/"):
icon = icon[8:] # strip the '${SNAP}' prefix.
icon = os.path.join(workdir, icon)

icon_path = (
icon
if os.path.isabs(icon)
Expand Down
10 changes: 10 additions & 0 deletions tests/unit/extractors/test_appstream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,16 @@ def test_appstream_no_icon_desktop_fallback_icon_exists(self):
open("icon.png", "w").close()
self._expect_icon("/icon.png")

def test_appstream_no_icon_desktop_fallback_icon_exists_with_snap_variable_prefix(
self
):
self._create_appstream_file()
_create_desktop_file(
"usr/share/applications/my.app.desktop", icon="${{SNAP}}/icon.png"
) # icon: '${SNAP}/icon.png'.
open("icon.png", "w").close()
self._expect_icon("/icon.png")

def test_appstream_no_icon_theme_fallback_png(self):
self._create_appstream_file()
_create_desktop_file("usr/share/applications/my.app.desktop", icon="icon")
Expand Down