From 867795ea263ecd391e3f641c0ddf8935cef07265 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Sat, 5 Jun 2021 20:41:27 +0300
Subject: [PATCH] Revert "move snap build to core20"

This reverts commit a261ca623018a7fe44ebbbf4420084ea2bc26d4c.
---
 QIFData/installerCQtDeployer.pri | 9 ++++++---
 snap/snapcraft.yaml              | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/QIFData/installerCQtDeployer.pri b/QIFData/installerCQtDeployer.pri
index 5532eff..94540d1 100644
--- a/QIFData/installerCQtDeployer.pri
+++ b/QIFData/installerCQtDeployer.pri
@@ -66,9 +66,11 @@ message( ONLINE_REPO_DIR $$ONLINE_REPO_DIR)
                            $$PWD/../Distro/$$OUT_FILE
 }
 
-buildSnap.commands = snapcraft --use-lxd
-cleanSnap.commands = snapcraft clean --use-lxd
-deploySnap.commands = cp *.snap $$PWD/../Distro/
+buildSnap.commands = snapcraft
+clearSnap.commands = rm parts prime stage *.snap -rdf
+clearSnap2.commands = rm parts prime stage -rdf
+
+deploySnap.commands = rm *.snap -rdf && chmod 777 -R $$PWD/../prime && snapcraft && cp *.snap $$PWD/../Distro/
 releaseSnap.commands = snapcraft push *.snap # bad patern
 
 
@@ -79,6 +81,7 @@ releaseSnap.commands = snapcraft push *.snap # bad patern
     unix:deploy.depends += clearSnap
     unix:deploy.depends += buildSnap
     unix:deploy.depends += deploySnap
+    unix:deploy.depends += clearSnap2
     unix:release.depends += releaseSnap
 }
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index c0ebc23..bf0126d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -16,7 +16,7 @@ description: |
 
 grade: stable # must be 'stable' to release into candidate/stable channels
 confinement: strict # use 'strict' once you have the right plugs and slots
-base: core20
+base: core18
 icon: snap/gui/icon.png
 apps:
   cqtdeployer: