From 733c375afe7a9ff56dd14faee74f71050b1ac442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20Cruz?= Date: Sat, 6 Apr 2013 12:50:29 +0100 Subject: [PATCH] More small tweaks to the config. --- .jshintrc | 1 - lib/core/config.js | 21 +++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.jshintrc b/.jshintrc index acdf0b58..c0fceb36 100644 --- a/.jshintrc +++ b/.jshintrc @@ -57,6 +57,5 @@ "validthis": false, "nomen": false, - "onevar": false, "white": true } diff --git a/lib/core/config.js b/lib/core/config.js index d234ab4d..f4e18044 100644 --- a/lib/core/config.js +++ b/lib/core/config.js @@ -5,9 +5,9 @@ var mkdirp = require('mkdirp'); // Guess some needed properties based on the user OS var temp = process.env.TMPDIR - || process.env.TMP - || process.env.TEMP - || process.platform === 'win32' ? 'c:\\windows\\temp' : '/tmp'; + || process.env.TMP + || process.env.TEMP + || process.platform === 'win32' ? 'c:\\windows\\temp' : '/tmp'; var home = (process.platform === 'win32' ? process.env.USERPROFILE @@ -21,10 +21,11 @@ var folder = process.platform === 'win32' ? 'bower' : '.bower'; +// Guess proxy defined in the env var proxy = process.env.HTTPS_PROXY - || process.env.https_proxy - || process.env.HTTP_PROXY - || process.env.http_proxy; + || process.env.https_proxy + || process.env.HTTP_PROXY + || process.env.http_proxy; // ----------- @@ -55,10 +56,10 @@ try { // Add aliases that are meant to be used internally mout.object.mixIn(config, { - cache: path.join(config.roaming, 'cache'), - links: path.join(config.roaming, 'links'), - completion: path.join(config.roaming, 'completion'), - gitTemplate: path.join(config.roaming, 'git_template') + _cache: path.join(config.roaming, 'cache'), + _links: path.join(config.roaming, 'links'), + _completion: path.join(config.roaming, 'completion'), + _gitTemplate: path.join(config.roaming, 'git_template') }); // -----------