You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2015/05/20 16:17:01 UTC
cordova-lib git commit: CB-9048 Clean up git cloned directories
(close #222)
Repository: cordova-lib
Updated Branches:
refs/heads/master c080f6727 -> d426475e0
CB-9048 Clean up git cloned directories (close #222)
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/d426475e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/d426475e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/d426475e
Branch: refs/heads/master
Commit: d426475e0fd2a302e31ab230a05b86321fb4518a
Parents: c080f67
Author: Martin Bektchiev <ma...@telerik.com>
Authored: Wed May 20 09:31:59 2015 +0300
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed May 20 10:16:47 2015 -0400
----------------------------------------------------------------------
cordova-lib/src/gitclone.js | 2 +-
cordova-lib/src/plugman/util/plugins.js | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/d426475e/cordova-lib/src/gitclone.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/gitclone.js b/cordova-lib/src/gitclone.js
index f31f901..b977184 100644
--- a/cordova-lib/src/gitclone.js
+++ b/cordova-lib/src/gitclone.js
@@ -68,7 +68,7 @@ function clone(git_url, git_ref, clone_dir){
});
}
}).then(function(){
- events.emit('log', 'Repository "' + git_url + '" checked out to git ref "' + (git_ref || "master") + '".');
+ events.emit('log', 'Repository "' + git_url + '" checked out to git ref "' + (git_ref || 'master') + '".');
return tmp_dir;
}).fail(function (err) {
shell.rm('-rf', tmp_dir);
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/d426475e/cordova-lib/src/plugman/util/plugins.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/util/plugins.js b/cordova-lib/src/plugman/util/plugins.js
index 261fc57..928881d 100644
--- a/cordova-lib/src/plugman/util/plugins.js
+++ b/cordova-lib/src/plugman/util/plugins.js
@@ -49,7 +49,9 @@ module.exports = {
// should probably copy over entire plugin git repo contents into plugins_dir and handle subdir separately during install.
var plugin_dir = path.join(plugins_dir, plugin_id);
events.emit('verbose', 'Copying fetched plugin over "' + plugin_dir + '"...');
- shell.cp('-R', path.join(tmp_dir, '*'), plugin_dir);
+ shell.mkdir('-p', plugin_dir);
+ shell.mv(path.join(tmp_dir, '*'), plugin_dir);
+ shell.rm('-Rf', tmp_dir);
pluginInfo.dir = plugin_dir;
if (pluginInfoProvider) {
pluginInfoProvider.put(pluginInfo);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org