From 3e367235d6627a9b2aa333b2b81e75886d808818 Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Fri, 19 May 2023 09:21:29 +0200
Subject: Try to migrate SnapCraft Core 20 to 22 (following guide:
 https://forum.snapcraft.io/t/micro-howto-migrate-from-core20-to-core22/30188)

---
 snap/snapcraft.yaml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 9188d818..d00373fe 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -52,8 +52,8 @@ parts:
     #        https://bugs.launchpad.net/snapcraft/+bug/1813364
     parse-info: [setup.py]
     override-pull: |
-      snapcraftctl pull
-      "$SNAPCRAFT_STAGE"/scriptlets/selective-checkout
+      craftctl pull
+      "$CRAFT_STAGE"/scriptlets/selective-checkout
 
   bottle:
     plugin: python
@@ -61,8 +61,8 @@ parts:
     source-branch: release-0.12
     source-depth: 1
     override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/bottle-dist
+      mkdir -p $CRAFT_PART_BUILD/dist
+      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/bottle-dist
     organize:
       bottle-dist: bottle/dist
 
@@ -72,8 +72,8 @@ parts:
     source-tag: '6.1.2'
     source-depth: 1
     override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/docker-dist
+      mkdir -p $CRAFT_PART_BUILD/dist
+      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/docker-dist
     organize:
       docker-dist: docker/dist
 
@@ -83,8 +83,8 @@ parts:
     source-tag: '2.8.2'
     source-depth: 1
     override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/python-dateutil-dist
+      mkdir -p $CRAFT_PART_BUILD/dist
+      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/python-dateutil-dist
     organize:
       python-dateutil-dist: python-dateutil/dist
 
@@ -94,8 +94,8 @@ parts:
     source-tag: '1.16.0'
     source-depth: 1
     override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/six-dist
+      mkdir -p $CRAFT_PART_BUILD/dist
+      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/six-dist
     organize:
       six-dist: six/dist
 
@@ -105,8 +105,8 @@ parts:
     source-tag: '4.5.0'
     source-depth: 1
     override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/podman-dist
+      mkdir -p $CRAFT_PART_BUILD/dist
+      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/podman-dist
     organize:
       podman-dist: podman/dist
 
@@ -116,8 +116,8 @@ parts:
     source-tag: '23.1'
     source-depth: 1
     override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/packaging-dist
+      mkdir -p $CRAFT_PART_BUILD/dist
+      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/packaging-dist
     organize:
       packaging-dist: packaging/dist
 
-- 
cgit v1.2.3