mirror of
https://github.com/balena-io/balena-cli.git
synced 2025-04-17 15:58:54 +00:00
Auto-merge for PR #751 via VersionBot
Convert windows paths to posix when passing to tar
This commit is contained in:
commit
158d471a98
@ -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.2 - 2018-01-09
|
||||
|
||||
* Convert windows paths to posix when passing to tar #748 [Andrew Shirley]
|
||||
|
||||
## v6.12.1 - 2018-01-02
|
||||
|
||||
* Fix deprecation warning for os configure, when passing a bare UUID #744 [Tim Perry]
|
||||
|
@ -150,7 +150,7 @@ exports.tarDirectory = tarDirectory = (dir) ->
|
||||
relPath = path.relative(path.resolve(dir), file)
|
||||
Promise.join relPath, fs.stat(file), fs.readFile(file),
|
||||
(filename, stats, data) ->
|
||||
pack.entryAsync({ name: filename, size: stats.size, mode: stats.mode }, data)
|
||||
pack.entryAsync({ name: toPosixPath(filename), size: stats.size, mode: stats.mode }, data)
|
||||
.then ->
|
||||
pack.finalize()
|
||||
return pack
|
||||
@ -258,7 +258,7 @@ exports.runBuild = (params, options, getBundleInfo, logger) ->
|
||||
# if we need emulation
|
||||
if options.emulated and platformNeedsQemu()
|
||||
return transpose.transposeTarStream buildStream,
|
||||
hostQemuPath: qemuPath
|
||||
hostQemuPath: toPosixPath(qemuPath)
|
||||
containerQemuPath: "/tmp/#{QEMU_BIN_NAME}"
|
||||
else
|
||||
return buildStream
|
||||
@ -274,7 +274,7 @@ exports.runBuild = (params, options, getBundleInfo, logger) ->
|
||||
|
||||
if options.emulated and platformNeedsQemu()
|
||||
buildThroughStream = transpose.getBuildThroughStream
|
||||
hostQemuPath: qemuPath
|
||||
hostQemuPath: toPosixPath(qemuPath)
|
||||
containerQemuPath: "/tmp/#{QEMU_BIN_NAME}"
|
||||
|
||||
newStream = stream.pipe(buildThroughStream)
|
||||
@ -418,3 +418,7 @@ copyQemu = (context) ->
|
||||
.then ->
|
||||
fs.chmod(binPath, '755')
|
||||
.return(binPath)
|
||||
|
||||
toPosixPath = (systemPath) ->
|
||||
path = require('path')
|
||||
systemPath.replace(new RegExp('\\' + path.sep, 'g'), '/')
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "resin-cli",
|
||||
"version": "6.12.1",
|
||||
"version": "6.12.2",
|
||||
"description": "The official resin.io CLI tool",
|
||||
"main": "./build/actions/index.js",
|
||||
"homepage": "https://github.com/resin-io/resin-cli",
|
||||
|
Loading…
x
Reference in New Issue
Block a user