From 780893b4110f8d4ff84965601c26a6a5faf8016a Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Thu, 5 Feb 2015 08:53:05 -0400 Subject: [PATCH] Make os download modify options.output directly --- lib/actions/os.coffee | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/actions/os.coffee b/lib/actions/os.coffee index d4a3b6ba..3f1ebde0 100644 --- a/lib/actions/os.coffee +++ b/lib/actions/os.coffee @@ -52,27 +52,27 @@ exports.download = appId: params.id fileName = resin.models.os.generateCacheName(osParams) - outputFile = options.output or path.join(resin.settings.get('directories.os'), fileName) + options.output ?= path.join(resin.settings.get('directories.os'), fileName) async.waterfall [ (callback) -> # We need to ensure this directory exists - mkdirp(path.dirname(outputFile), _.unary(callback)) + mkdirp(path.dirname(options.output), _.unary(callback)) (callback) -> - console.info("Destination file: #{outputFile}\n") + console.info("Destination file: #{options.output}\n") bar = new visuals.widgets.Progress('Downloading Device OS') - resin.models.os.download osParams, outputFile, callback, (state) -> + resin.models.os.download osParams, options.output, callback, (state) -> console.log(bar.tick(state.percentage, state.eta)) ], (error) -> return done(error) if error? - console.info("\nFinished downloading #{outputFile}") - return done(null, outputFile) + console.info("\nFinished downloading #{options.output}") + return done(null, options.output) exports.install = signature: 'os install [device]'