From 97368aa175b8298230ad3efabca6937a6f02db0f Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Sun, 9 Jan 2022 11:40:39 +0300
Subject: [PATCH] [Ubuntu] put snap.sh upper environment cleanup (#4847)

---
 images/linux/ubuntu1804.json | 10 +++++-----
 images/linux/ubuntu2004.json | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index 4fb6da11e..538f8019e 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -294,6 +294,11 @@
             ],
             "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'"
         },
+        {
+            "type": "shell",
+            "script": "{{template_dir}}/scripts/base/snap.sh",
+            "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
+        },
         {
             "type": "shell",
             "expect_disconnect": true,
@@ -316,11 +321,6 @@
             "script": "{{template_dir}}/scripts/base/apt-mock-remove.sh",
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
-        {
-            "type": "shell",
-            "script": "{{template_dir}}/scripts/base/snap.sh",
-            "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
-        },
         {
             "type": "shell",
             "inline": [
diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json
index d88e3779c..a44f7402d 100644
--- a/images/linux/ubuntu2004.json
+++ b/images/linux/ubuntu2004.json
@@ -295,6 +295,11 @@
             ],
             "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'"
         },
+        {
+            "type": "shell",
+            "script": "{{template_dir}}/scripts/base/snap.sh",
+            "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
+        },
         {
             "type": "shell",
             "expect_disconnect": true,
@@ -317,11 +322,6 @@
             "script": "{{template_dir}}/scripts/base/apt-mock-remove.sh",
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
-        {
-            "type": "shell",
-            "script": "{{template_dir}}/scripts/base/snap.sh",
-            "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
-        },
         {
             "type": "shell",
             "inline": [