From 89899cfcc9b19adf30cc401dda0ebf1f302795fd Mon Sep 17 00:00:00 2001
From: Martin Bektchiev <martin.bektchiev@telerik.com>
Date: Mon, 8 Sep 2014 14:21:21 +0300
Subject: [PATCH 1/2] CB-7496 Fix --link option for plugman install

---
 cordova-lib/package.json           | 2 +-
 cordova-lib/src/plugman/install.js | 1 -
 cordova-lib/src/plugman/plugman.js | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cordova-lib/package.json b/cordova-lib/package.json
index 151806566..6ebe2e028 100644
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@ -31,7 +31,7 @@
     "rc": "0.3.0",
     "request": "2.22.0",
     "semver": "2.0.x",
-    "shelljs": "0.1.x",
+    "shelljs": "0.3.x",
     "tar": "0.1.x",
     "underscore": "1.4.4",
     "xcode": "0.6.6",
diff --git a/cordova-lib/src/plugman/install.js b/cordova-lib/src/plugman/install.js
index 83834b483..5131f7cfb 100644
--- a/cordova-lib/src/plugman/install.js
+++ b/cordova-lib/src/plugman/install.js
@@ -93,7 +93,6 @@ function possiblyFetch(id, plugins_dir, options) {
     }
 
     var opts = underscore.extend({}, options, {
-        link: false,
         client: 'plugman'
     });
 
diff --git a/cordova-lib/src/plugman/plugman.js b/cordova-lib/src/plugman/plugman.js
index d39544b67..e6dc38c68 100644
--- a/cordova-lib/src/plugman/plugman.js
+++ b/cordova-lib/src/plugman/plugman.js
@@ -111,7 +111,8 @@ plugman.commands =  {
             subdir: '.',
             cli_variables: cli_variables,
             www_dir: cli_opts.www,
-            searchpath: cli_opts.searchpath
+            searchpath: cli_opts.searchpath,
+            link: cli_opts.link
         };
 
         var p = Q();

From d8e9073b681adfeb94cd93472378db7caae3b1cd Mon Sep 17 00:00:00 2001
From: Martin Bektchiev <martin.bektchiev@telerik.com>
Date: Tue, 16 Sep 2014 12:59:10 +0300
Subject: [PATCH 2/2] Ensure existence of cordova/plugins directory.

---
 cordova-lib/src/plugman/install.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cordova-lib/src/plugman/install.js b/cordova-lib/src/plugman/install.js
index 5131f7cfb..f9dd4ff7b 100644
--- a/cordova-lib/src/plugman/install.js
+++ b/cordova-lib/src/plugman/install.js
@@ -608,7 +608,8 @@ function copyPlugin(plugin_src_dir, plugins_dir, link) {
 
     if (link) {
         events.emit('verbose', 'Symlinking from location "' + plugin_src_dir + '" to location "' + dest + '"');
-        fs.symlinkSync(plugin_src_dir, dest, 'dir');
+		shell.mkdir('-p', path.dirname(dest));
+		fs.symlinkSync(plugin_src_dir, dest, 'dir');
     } else {
         shell.mkdir('-p', dest);
         events.emit('verbose', 'Copying from location "' + plugin_src_dir + '" to location "' + dest + '"');