Merge ~os369510/fisterra/+git/nitrogen6x-gadget:18-classic-devel into ~fisterra-team/fisterra/+git/nitrogen6x-gadget:18-classic

[jeremyszu]

$ git log
commit 1c8a7372554423467b956060fd28bce01488dec8 (HEAD -> 18-classic, myppa/18-classic-devel)
Author: Jeremy Su <email address hidden>
Date: Tue Jun 16 16:04:48 2020 +0800

    fix warning from shellcheck

commit 9a1c073eb7502dae4aea73981a7848ba7e4e294d
Author: Jeremy Su <email address hidden>
Date: Tue Jun 16 16:04:27 2020 +0800

    fix build fail when using snapcraft from snap repo

The generic build script changed to use snapcraft from snap store.
After that, the gadget will get build fail due to the latest snapcraft changes.

[Soar Huang (soarhuang)]

review: Approve

[ethan.hsieh (ethan.hsieh)]

review: Approve

diff --git a/build.sh b/build.sh
index c52ae23..4e1cc0b 100644
--- a/build.sh
+++ b/build.sh
@@ -17,7 +17,7 @@
 usage()
 {
 	echo "Please use either --core or --classic"
-	exit -1
+	exit 255
 }
 
 core=""
@@ -41,11 +41,17 @@ done
 
 set -x
 
+if [ "$(systemd-detect-virt)" != "none" ]; then
+	destructive_mode="--destructive-mode"
+else
+	destructive_mode=""
+fi
+
 if [ -z "${core}" ] && [ -z "${classic}" ]; then
 	usage
-elif [ ! -z "${core}" ] && [ ! -z "${classic}" ]; then
+elif [ -n "${core}" ] && [ -n "${classic}" ]; then
 	usage
 fi
-sudo snapcraft clean
-sudo snapcraft ${args} prime ${parts[@]}
-sudo snapcraft ${args} pack prime
+sudo snapcraft clean "${destructive_mode}"
+sudo snapcraft "${args}" prime "${parts[@]}" "${destructive_mode}"
+sudo snapcraft "${args}" pack prime
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 86faf9b..16bd3cf 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: nitrogen6x
-version: 18
+version: "18"
 summary: Nitrogen6x support package
 description: |
  Support files for booting Boundary devices Nitrogen6x
@@ -12,6 +12,7 @@ grade: stable
 parts:
   core-meta:
     plugin: nil
+    source: .
     after:
       - uboot-fw
       - uboot-env
@@ -24,6 +25,7 @@ parts:
       cp snap.yaml $SNAPCRAFT_PART_INSTALL/meta
   classic-meta:
     plugin: nil
+    source: .
     after:
       - uboot-fw
       - uboot-bootscript