Merge branch 'master' into chrisys-patch

.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

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

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)

lib/sdk/image-stream/supported.js

@@ -80,5 +80,9 @@ module.exports = [
   {
     extension: 'rpi-sdimg',
     type: 'image'
+  },
+  {
+    extension: 'wic',
+    type: 'image'
   }
 ]

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 () {