Skip to content

Commit

Permalink
Auto-merge for PR #759 via VersionBot
Browse files Browse the repository at this point in the history
Don't use the deprecated 'os configure' format in internal calls
  • Loading branch information
resin-io-versionbot[bot] committed Jan 29, 2018
2 parents 4e41261 + 3761ab9 commit 0cb4bc9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion lib/actions/config.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lib/actions/device.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 0cb4bc9

Please sign in to comment.