Auto-merge for PR #759 via VersionBot

Don't use the deprecated 'os configure' format in internal calls

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.12.6 - 2018-01-29
+
+* Don't use the deprecated 'os configure' format in internal calls #759 [Tim Perry]
+
 ## v6.12.5 - 2018-01-11
 
 * Fix breakage in deploy command from recent TS conversion #754 [Tim Perry]

lib/actions/config.coffee

@@ -207,7 +207,7 @@ exports.reconfigure =
 				.tap ->
 					umountAsync(drive)
 				.then (uuid) ->
-					configureCommand = "os configure #{drive} #{uuid}"
+					configureCommand = "os configure #{drive} --device #{uuid}"
 					if options.advanced
 						configureCommand += ' --advanced'
 					return capitanoRunAsync(configureCommand)

lib/actions/device.coffee

@@ -420,7 +420,7 @@ exports.init =
 				capitanoRunAsync("device register #{application.app_name}")
 					.then(resin.models.device.get)
 					.tap (device) ->
-						configureCommand = "os configure '#{tempPath}' #{device.uuid}"
+						configureCommand = "os configure '#{tempPath}' --device #{device.uuid}"
 						if options.config
 							configureCommand += " --config '#{options.config}'"
 						else if options.advanced

package.json

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