Skip to content

Commit

Permalink
snapd: bugfix: Fix formatting error and change to critical
Browse files Browse the repository at this point in the history
**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
  • Loading branch information
Tracey Clark committed Dec 24, 2024
1 parent 90b1859 commit 6d00a2d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
11 changes: 7 additions & 4 deletions packages/s/snapd/files/wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,18 @@ fi

if [[ "${CONFINEMENT}" != "strict" ]] && [[ "${DISABLE_CONFINEMENT_WARNING:-n}" != "y" ]]
then
if [[ -n "${BAMF_DESKTOP_FILE_HINT+x}" ]] && [[ -n "${GIO_LAUNCHED_DESKTOP_FILE+x}" ]]
# This prevents the warning from showing on KDE Plasma
# if [[ -n "${BAMF_DESKTOP_FILE_HINT+x}" ]] && [[ -n "${GIO_LAUNCHED_DESKTOP_FILE+x}" ]]

if [[ -n "${BAMF_DESKTOP_FILE_HINT+x}" ]]
then
notify-send \
--app-name Snap \
--urgency normal \
--urgency critical \
--icon dialog-warning \
"Snap has ${CONFINEMENT} confinement" \
"Snaps will stop working in early January 2025." \
"See ${URL} for details."
"Snaps will stop working in early January 2025. For details see<br> \
${URL}"
else
echo -e "${YELLOW}WARNING:${NC} snap is running with ${CONFINEMENT} confinement." \
"Snaps will stop working in early January 2025." \
Expand Down
2 changes: 1 addition & 1 deletion packages/s/snapd/package.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name : snapd

Check warning on line 1 in packages/s/snapd/package.yml

View workflow job for this annotation

GitHub Actions / Checks

`monitoring.yml` is missing
version : 2.63
homepage : https://snapcraft.io/
release : 83
release : 84
source :
- https://github.com/snapcore/snapd/releases/download/2.63/snapd_2.63.vendor.tar.xz : 2f0083d2c4e087c29f48cd1abb8a92eb2e63cf04cd433256c86fac05d0b28cab
license : GPL-3.0-only
Expand Down
12 changes: 6 additions & 6 deletions packages/s/snapd/pspec_x86_64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<Name>snapd</Name>
<Homepage>https://snapcraft.io/</Homepage>
<Packager>
<Name>David Harder</Name>
<Email>[email protected]</Email>
<Name>Tracey Clark</Name>
<Email>[email protected]</Email>
</Packager>
<License>GPL-3.0-only</License>
<PartOf>desktop</PartOf>
Expand Down Expand Up @@ -77,12 +77,12 @@
</Files>
</Package>
<History>
<Update release="83">
<Date>2024-12-20</Date>
<Update release="84">
<Date>2024-12-24</Date>
<Version>2.63</Version>
<Comment>Packaging update</Comment>
<Name>David Harder</Name>
<Email>[email protected]</Email>
<Name>Tracey Clark</Name>
<Email>[email protected]</Email>
</Update>
</History>
</PISI>

0 comments on commit 6d00a2d

Please sign in to comment.