From 1acfb01e61af78ceab13af110b77253b7ef85434 Mon Sep 17 00:00:00 2001
From: Joe Testa <jtesta@positronsecurity.com>
Date: Tue, 20 Oct 2020 15:30:04 -0400
Subject: [PATCH] Updated Snap instructions & Makefile.snap.

---
 Makefile.snap  | 4 +---
 PACKAGING      | 4 ++--
 snapcraft.yaml | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Makefile.snap b/Makefile.snap
index 90e5e21..a5e0292 100644
--- a/Makefile.snap
+++ b/Makefile.snap
@@ -1,8 +1,6 @@
 all:
-	cp ../ssh-audit.py sshaudit/sshaudit.py
-	cp ../README.md sshaudit/README.md
 	echo -e "\n\nDid you remember to bump the version number in snapcraft.yaml?\n\n"
 	snapcraft --use-lxd
 
 clean:
-	rm -rf parts/ prime/ snap/ stage/ build/ dist/ *.egg-info/ sshaudit/sshaudit.py sshaudit/LICENSE sshaudit/README.md ssh-audit*.snap
+	rm -rf parts/ prime/ snap/ stage/ build/ dist/ src/*.egg-info/ ssh-audit*.snap
diff --git a/PACKAGING b/PACKAGING
index 256bbfa..1012247 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -31,11 +31,11 @@ $ pip3 install ssh-audit
 
 To create the snap package, run a fully-updated Ubuntu Server 20.04 VM.
 
-As root, run:
+As root, run (leave all options default):
 
 # lxd init
 
-Leave all options default.  Bump the version number in snapcraft.yaml.  Then run:
+Bump the version number in snapcraft.yaml.  Then run:
 
 # make -f Makefile.snap
 
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 4928ec8..0b48201 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,11 +1,11 @@
 name: ssh-audit
-version: '2.2.0-1'
+version: '2.3.1-1'
 license: 'MIT'
 summary: ssh-audit
 description: |
   SSH server and client security configuration auditor.  Official repository: <https://github.com/jtesta/ssh-audit>
 
-base: core18
+base: core20
 grade: stable
 confinement: strict
 
@@ -17,5 +17,5 @@ apps:
 parts:
   ssh-audit:
     plugin: python
-    python-version: python3
+    # python-version: python3
     source: .