snapd: bugfix: Fix formatting error and change to critical

**Summary**
Fix text to be two lines not three per spec
Change urgency to critical so users must manually dismiss the notification
to give them time to copy the link

Resolves #4636
This commit is contained in:
Tracey Clark 2024-12-24 10:19:25 -06:00 committed by Silke Hofstra
parent 8cef8e1f75
commit 692f905b39
3 changed files with 15 additions and 11 deletions

View file

@ -29,15 +29,19 @@ fi
if [[ "${CONFINEMENT}" != "strict" ]] && [[ "${DISABLE_CONFINEMENT_WARNING:-n}" != "y" ]] if [[ "${CONFINEMENT}" != "strict" ]] && [[ "${DISABLE_CONFINEMENT_WARNING:-n}" != "y" ]]
then then
if [[ -n "${BAMF_DESKTOP_FILE_HINT+x}" ]] && [[ -n "${GIO_LAUNCHED_DESKTOP_FILE+x}" ]]
if [[ -n "${BAMF_DESKTOP_FILE_HINT+x}" ]]
then then
# Ensure the notify-send meets the freedesktop standards
# https://specifications.freedesktop.org/notification-spec/latest/
# Keep it short and test on all DEs
# Also, we can't use any HTML tags, they are only optionally supported
notify-send \ notify-send \
--app-name Snap \ --app-name Snap \
--urgency normal \ --urgency critical \
--icon dialog-warning \ --icon dialog-warning \
"Snap has ${CONFINEMENT} confinement" \ "Snap has ${CONFINEMENT} confinement" \
"Snaps will stop working in early January 2025." \ "Snaps will stop working in Jan. 2025. See ${URL}"
"See ${URL} for details."
else else
echo -e "${YELLOW}WARNING:${NC} snap is running with ${CONFINEMENT} confinement." \ echo -e "${YELLOW}WARNING:${NC} snap is running with ${CONFINEMENT} confinement." \
"Snaps will stop working in early January 2025." \ "Snaps will stop working in early January 2025." \

View file

@ -1,7 +1,7 @@
name : snapd name : snapd
version : 2.63 version : 2.63
homepage : https://snapcraft.io/ homepage : https://snapcraft.io/
release : 83 release : 84
source : source :
- https://github.com/snapcore/snapd/releases/download/2.63/snapd_2.63.vendor.tar.xz : 2f0083d2c4e087c29f48cd1abb8a92eb2e63cf04cd433256c86fac05d0b28cab - https://github.com/snapcore/snapd/releases/download/2.63/snapd_2.63.vendor.tar.xz : 2f0083d2c4e087c29f48cd1abb8a92eb2e63cf04cd433256c86fac05d0b28cab
license : GPL-3.0-only license : GPL-3.0-only

View file

@ -3,8 +3,8 @@
<Name>snapd</Name> <Name>snapd</Name>
<Homepage>https://snapcraft.io/</Homepage> <Homepage>https://snapcraft.io/</Homepage>
<Packager> <Packager>
<Name>David Harder</Name> <Name>Tracey Clark</Name>
<Email>david@davidjharder.ca</Email> <Email>traceyc.dev@tlcnet.info</Email>
</Packager> </Packager>
<License>GPL-3.0-only</License> <License>GPL-3.0-only</License>
<PartOf>desktop</PartOf> <PartOf>desktop</PartOf>
@ -77,12 +77,12 @@
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="83"> <Update release="84">
<Date>2024-12-20</Date> <Date>2024-12-31</Date>
<Version>2.63</Version> <Version>2.63</Version>
<Comment>Packaging update</Comment> <Comment>Packaging update</Comment>
<Name>David Harder</Name> <Name>Tracey Clark</Name>
<Email>david@davidjharder.ca</Email> <Email>traceyc.dev@tlcnet.info</Email>
</Update> </Update>
</History> </History>
</PISI> </PISI>