From db8d2953cb46004020a6f7068f65c28dbe967a58 Mon Sep 17 00:00:00 2001
From: Randall Wood <297232+rhwood@users.noreply.github.com>
Date: Mon, 26 Nov 2018 17:23:38 -0800
Subject: [PATCH 1/2] Update MacOS installation instructions.

Homebrew/homebrew-cask#55358 changed the name used for installation.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f0659d96..917370a9 100644
--- a/README.md
+++ b/README.md
@@ -120,13 +120,13 @@ so it might not refer to the latest version immediately after an Etcher
 release.
 
 ```sh
-brew cask install etcher
+brew cask install balenaetcher
 ```
 
 ##### Uninstall
 
 ```sh
-brew cask uninstall etcher
+brew cask uninstall balenaetcher
 ```
 
 #### Chocolatey (Windows)

From 7565e809b072de476b20450ad68212918eeb6a55 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 26 Nov 2018 20:59:19 -0200
Subject: [PATCH 2/2] Add `.wic` image extension as supported format

The `.wic` is a widely used image format in the OpenEmbedded / Yocto
Project ecosystem and is straightforward to be supported.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .gitattributes                         | 1 +
 Makefile                               | 2 +-
 lib/sdk/image-stream/supported.js      | 4 ++++
 tests/shared/supported-formats.spec.js | 7 +++++--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 9a116578..c6e76c6a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -45,5 +45,6 @@ Makefile text
 *.bin binary diff=hex
 *.dmg binary diff=hex
 *.rpi-sdcard binary diff=hex
+*.wic binary diff=hex
 *.foo binary diff=hex
 xz-without-extension binary diff=hex
diff --git a/Makefile b/Makefile
index aa23c704..c9cb8c80 100644
--- a/Makefile
+++ b/Makefile
@@ -201,7 +201,7 @@ lint-spell:
 	codespell \
 		--dictionary - \
 		--dictionary dictionary.txt \
-		--skip *.svg *.gz,*.bz2,*.xz,*.zip,*.img,*.dmg,*.iso,*.rpi-sdcard,.DS_Store,*.dtb,*.dtbo,*.dat,*.elf,*.bin,*.foo,xz-without-extension \
+		--skip *.svg *.gz,*.bz2,*.xz,*.zip,*.img,*.dmg,*.iso,*.rpi-sdcard,*.wic,.DS_Store,*.dtb,*.dtbo,*.dat,*.elf,*.bin,*.foo,xz-without-extension \
 		lib tests docs scripts Makefile *.md LICENSE
 
 lint: lint-js lint-sass lint-cpp lint-html lint-spell
diff --git a/lib/sdk/image-stream/supported.js b/lib/sdk/image-stream/supported.js
index 6d486215..9e2320da 100644
--- a/lib/sdk/image-stream/supported.js
+++ b/lib/sdk/image-stream/supported.js
@@ -80,5 +80,9 @@ module.exports = [
   {
     extension: 'rpi-sdimg',
     type: 'image'
+  },
+  {
+    extension: 'wic',
+    type: 'image'
   }
 ]
diff --git a/tests/shared/supported-formats.spec.js b/tests/shared/supported-formats.spec.js
index 9377e9e2..55d361a2 100644
--- a/tests/shared/supported-formats.spec.js
+++ b/tests/shared/supported-formats.spec.js
@@ -31,7 +31,9 @@ describe('Shared: SupportedFormats', function () {
   describe('.getNonCompressedExtensions()', function () {
     it('should return the supported non compressed extensions', function () {
       const extensions = supportedFormats.getNonCompressedExtensions()
-      m.chai.expect(extensions).to.deep.equal([ 'img', 'iso', 'bin', 'dsk', 'hddimg', 'raw', 'dmg', 'sdcard', 'rpi-sdimg' ])
+      m.chai.expect(extensions).to.deep.equal([
+        'img', 'iso', 'bin', 'dsk', 'hddimg', 'raw', 'dmg', 'sdcard', 'rpi-sdimg', 'wic'
+      ])
     })
   })
 
@@ -72,7 +74,8 @@ describe('Shared: SupportedFormats', function () {
       'path/to/filename.hddimg',
       'path/to/filename.raw',
       'path/to/filename.dmg',
-      'path/to/filename.sdcard'
+      'path/to/filename.sdcard',
+      'path/to/filename.wic'
 
     ], (filename) => {
       it(`should return true for ${filename}`, function () {