Auto-merge for PR #678 via VersionBot

Fix resin preload --splash-image argument handling

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v6.6.9 - 2017-10-06
+
+* Fix resin preload --splash-image argument handling #678 [Alexis Svinartchouk]
+
 ## v6.6.8 - 2017-10-06
 
 * Ensure analytics failures (e.g. from broken tokens) at startup don't break commands #675 [Tim Perry]

build/actions/preload.js

@@ -174,6 +174,8 @@ module.exports = {
     delete options.app;
     options.dontDetectFlasherTypeImages = options['dont-detect-flasher-type-images'];
     delete options['dont-detect-flasher-type-images'];
+    options.splashImage = options['splash-image'];
+    delete options['splash-image'];
     return dockerUtils.getDocker(options).then(function(docker) {
       var buildOutputStream;
       buildOutputStream = preload.build(docker);

lib/actions/preload.coffee

@@ -168,6 +168,9 @@ module.exports =
 		options.dontDetectFlasherTypeImages = options['dont-detect-flasher-type-images']
 		delete options['dont-detect-flasher-type-images']
 
+		options.splashImage = options['splash-image']
+		delete options['splash-image']
+
 		# Get a configured dockerode instance
 		dockerUtils.getDocker(options)
 		.then (docker) ->

package.json

@@ -1,6 +1,6 @@
 {
   "name": "resin-cli",
-  "version": "6.6.8",
+  "version": "6.6.9",
   "description": "The official resin.io CLI tool",
   "main": "./build/actions/index.js",
   "homepage": "https://github.com/resin-io/resin-cli",