From fb578f19f472c87d422740c42055f89214fab5e3 Mon Sep 17 00:00:00 2001
From: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
Date: Mon, 9 Sep 2024 20:07:43 +0200
Subject: [PATCH] Update post-install hook for Ubuntu 24.04

Signed-off-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
---
 data/versioned/24.04/post_setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/versioned/24.04/post_setup.sh b/data/versioned/24.04/post_setup.sh
index 03eeb60..7ff8be4 100644
--- a/data/versioned/24.04/post_setup.sh
+++ b/data/versioned/24.04/post_setup.sh
@@ -29,8 +29,7 @@ function setup_snap() {
   if command -v snap &>/dev/null; then
     log 'info' "Purging 'snapd'"
 
-    killall snap
-    systemctl stop snapd
+    killall snap &>/dev/null || :
 
     until [[ $(snap list 2>&1 || :) == 'No snaps'*'installed'* ]]; do
       while read -r SNAP _; do
@@ -38,6 +37,7 @@ function setup_snap() {
       done < <(snap list |& tail -n +2 || :)
     done
 
+    systemctl stop snapd.service snapd.socket
     apt-get -qq purge snapd gnome-software-plugin-snap
     apt-mark -qq hold snapd
     rm -rf /var/cache/snapd/ "${HOME}/snapd" "${HOME}/snap"