From 4143b6da49a9d6f77fcc22d6df73191660cae645 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Wed, 3 Dec 2014 09:26:14 -0400 Subject: [PATCH] Namespace directories inside config.directories --- lib/actions/os.coffee | 2 +- lib/resin/config.coffee | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/actions/os.coffee b/lib/actions/os.coffee index 9051993d..ef9bb702 100644 --- a/lib/actions/os.coffee +++ b/lib/actions/os.coffee @@ -13,7 +13,7 @@ exports.download = (id) -> wifiKey: resin.cli.getArgument('wifiKey') fileName = resin.os.generateCacheName(id, params) - outputFile = resin.cli.getArgument('output') or path.join(resin.config.osDirectory, fileName) + outputFile = resin.cli.getArgument('output') or path.join(resin.config.directories.os, fileName) async.waterfall [ diff --git a/lib/resin/config.coffee b/lib/resin/config.coffee index 6e81ed5e..ed598eb1 100644 --- a/lib/resin/config.coffee +++ b/lib/resin/config.coffee @@ -1,3 +1,4 @@ +_ = require('lodash') path = require('path') config = @@ -11,6 +12,10 @@ config = dataPrefix: path.join(process.env.HOME, '.resin') sshKeyWidth: 43 + directories: + plugins: 'plugins' + os: 'os' + pubnub: subscribe_key: 'sub-c-bbc12eba-ce4a-11e3-9782-02ee2ddab7fe' publish_key: 'pub-c-6cbce8db-bfd1-4fdf-a8c8-53671ae2b226' @@ -29,7 +34,7 @@ config = sshKey: '/user/keys/<%= id %>' download: '/download' -config.pluginsDirectory = path.join(config.dataPrefix, 'plugins') -config.osDirectory = path.join(config.dataPrefix, 'os') +config.directories = _.object _.map config.directories, (value, key) -> + return [ key, path.join(config.dataPrefix, value) ] module.exports = config