Auto-merge for PR #777 via VersionBot

Add support for Balena in local ssh

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.13.0 - 2018-02-06
+
+* Add support for Balena in local ssh #777 [Tim Perry]
+
 ## v6.12.9 - 2018-02-05
 
 * Switch back to upstream global-tunnel-ng #781 [Alexis Svinartchouk]

lib/actions/local/ssh.coffee

@@ -103,7 +103,8 @@ module.exports =
 
 			if not options.host
 				shellCmd = '''/bin/sh -c $"'if [ -e /bin/bash ]; then exec /bin/bash; else exec /bin/sh; fi'"'''
-				command += " docker exec -ti #{container} #{shellCmd}"
+				dockerCmd = "'$(if [ -f /usr/bin/balena ]; then echo \"balena\"; else echo \"docker\"; fi)'"
+				command += " #{dockerCmd} exec -ti #{container} #{shellCmd}"
 
 			subShellCommand = getSubShellCommand(command)
 			child_process.spawn subShellCommand.program, subShellCommand.args,

package.json

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