From 5e1d49cc7eede3e943ba4dcc03587f9e90ca848b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Cruz?= <andremiguelcruz@msn.com>
Date: Sat, 6 Apr 2013 16:28:14 +0100
Subject: [PATCH] Forgot to add some packages to the package.json, add notes on
 the rc package.

---
 TODO.md            |  1 +
 lib/core/config.js | 15 +++++----------
 package.json       |  3 ++-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/TODO.md b/TODO.md
index e007d8ce..ed1f3585 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,4 +5,5 @@ TODO list:
    - Allow `config.cwd` to be changed by an argument when using the CLI. Two ways of doing this:
       - Read a --cwd or similar and change the `config.cwd` to it
       - Allow any arbitrary `config.*` to be changed with --config.* arguments
+         - It seems that `rc` already does this, but is bugged.. see: https://github.com/dominictarr/rc/issues/9
 - Gracefully remove all created tmp dirs
diff --git a/lib/core/config.js b/lib/core/config.js
index f4e18044..8050d90d 100644
--- a/lib/core/config.js
+++ b/lib/core/config.js
@@ -14,12 +14,8 @@ var home = (process.platform === 'win32'
     : process.env.HOME) || temp;
 
 var roaming = process.platform === 'win32'
-    ? path.resolve(process.env.APPDATA || home || temp)
-    : path.resolve(home || temp);
-
-var folder = process.platform === 'win32'
-    ? 'bower'
-    : '.bower';
+    ? path.join(path.resolve(process.env.APPDATA || home || temp), 'bower')
+    : path.join(path.resolve(home || temp), '.bower');
 
 // Guess proxy defined in the env
 var proxy = process.env.HTTPS_PROXY
@@ -33,11 +29,10 @@ var proxy = process.env.HTTPS_PROXY
 var config;
 try {
     config = require('rc')('bower', {
-        cwd: process.cwd(),
-        roaming: path.join(roaming, folder),
         json: 'bower.json',
         directory: 'bower_components',
-        proxy: proxy
+        proxy: proxy,
+        roaming: roaming
     });
 } catch (e) {
     throw new Error('Unable to parse global .bowerrc file: ' + e.message);
@@ -54,7 +49,7 @@ try {
     }
 } catch (e) {}
 
-// Add aliases that are meant to be used internally
+// Create some aliases to be used internally
 mout.object.mixIn(config, {
     _cache: path.join(config.roaming, 'cache'),
     _links: path.join(config.roaming, 'links'),
diff --git a/package.json b/package.json
index e2fb2760..6f6b37ba 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "q": "~0.9.2",
     "tmp": "0.0.16",
     "rc": "~0.1.0",
-    "mkdirp": "~0.3.5"
+    "mkdirp": "~0.3.5",
+    "nopt": "~2.1.1"
   },
   "devDependencies": {
     "mocha": "~1.8.2",