fix linking package.json reading, and directories flattening behaviou…

…rs (#416)
jspm · Jan 30, 2015 · 8553d98 · 8553d98
1 parent 0cf5511
commit 8553d98
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/lib/link.js b/lib/link.js
@@ -71,10 +71,14 @@ exports.link = function(name, dir, force) {
     // create it
     .then(function() {
       if (pjson.directories) {
-        if (pjson.directories.dist)
-          dir = path.resolve(dir, pjson.directories.dist);
-        else if (pjson.directories.lib)
+        if (pjson.directories.lib) {
           dir = path.resolve(dir, pjson.directories.lib);
+          delete pjson.directories.lib;
+        }
+        if (pjson.directories.dist) {
+          dir = path.resolve(dir, pjson.directories.dist);
+          delete pjson.directories.dist;
+        }
       }
 
       return asp(mkdirp)(linkDir);
@@ -182,7 +186,7 @@ exports.symlink = function(pkg, downloadDeps) {
       return asp(fs.symlink)(linkDir, dir, 'dir');
     })
     .then(function() {
-      return readJSON(path.resolve(dir, 'package.json'));
+      return readJSON(path.resolve(dir, '.jspm.json'));
     })
     .then(function(_pjson) {
       pjson = config.derivePackageConfig(_pjson);