From 0bfb5d6979420c295bcc50c6c4213c2dd3a8e2f2 Mon Sep 17 00:00:00 2001
From: Joe Testa <jtesta@positronsecurity.com>
Date: Tue, 25 Apr 2023 11:54:12 -0400
Subject: [PATCH] Updated snap base image.  Now installing snapcraft tool from
 snap instead of apt.

---
 PACKAGING.md   | 2 +-
 build_snap.sh  | 5 +++--
 snapcraft.yaml | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/PACKAGING.md b/PACKAGING.md
index 655bfb4..b47d761 100644
--- a/PACKAGING.md
+++ b/PACKAGING.md
@@ -54,7 +54,7 @@ To download from production server and verify:
 
 # Snap
 
-To create the snap package, run a fully-updated Ubuntu Server 20.04 VM.
+To create the snap package, run a fully-updated Ubuntu Server 22.04 VM.
 
 Create the snap package with:
 ```
diff --git a/build_snap.sh b/build_snap.sh
index 42ed880..ff6bd7c 100755
--- a/build_snap.sh
+++ b/build_snap.sh
@@ -32,8 +32,9 @@
 
 
 # Pre-requisites
-sudo apt install -y make snapcraft
-sudo snap install review-tools lxd 2> /dev/null
+sudo apt install -y make
+sudo snap install snapcraft --classic
+sudo snap install review-tools lxd
 
 # Initialize LXD.
 sudo lxd init --auto
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 7b39caf..ab44474 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -5,7 +5,7 @@ summary: ssh-audit
 description: |
   SSH server and client security configuration auditor.  Official repository: <https://github.com/jtesta/ssh-audit>
 
-base: core20
+base: core22
 grade: stable
 confinement: strict