ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-01-31 16:36:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #759 via VersionBot

Browse Source 
Don't use the deprecated 'os configure' format in internal calls
This commit is contained in:
resin-io-versionbot[bot] 2018-01-29 14:56:00 +00:00 committed by GitHub
commit 0cb4bc951a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -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! automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/). 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 ## v6.12.5 - 2018-01-11
* Fix breakage in deploy command from recent TS conversion #754 [Tim Perry] * Fix breakage in deploy command from recent TS conversion #754 [Tim Perry]

2
lib/actions/config.coffee
View File

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

2
lib/actions/device.coffee
View File

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

2
package.json
View File

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