Repository: cordova-app-harness Updated Branches: refs/heads/master 5a76c4022 -> 4baa54905
Made a couple of small bug fixes. Removed trailing slashes from push directory. Fixed app id when deleting files from an incremental push. Project: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/commit/4baa5490 Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/4baa5490 Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/4baa5490 Branch: refs/heads/master Commit: 4baa54905d68bdc08e1cf33436c7e783c98ddb46 Parents: 5a76c40 Author: Max Woghiren <[email protected]> Authored: Tue May 27 14:45:17 2014 -0400 Committer: Max Woghiren <[email protected]> Committed: Tue May 27 14:45:17 2014 -0400 ---------------------------------------------------------------------- .../node_modules/cordova-harness-client/pushsession.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/4baa5490/harness-push/node_modules/cordova-harness-client/pushsession.js ---------------------------------------------------------------------- diff --git a/harness-push/node_modules/cordova-harness-client/pushsession.js b/harness-push/node_modules/cordova-harness-client/pushsession.js index 23934f7..b3f6d9f 100644 --- a/harness-push/node_modules/cordova-harness-client/pushsession.js +++ b/harness-push/node_modules/cordova-harness-client/pushsession.js @@ -95,6 +95,11 @@ function calculateMd5(fileName) { } function buildAssetManifest(dir, configXmlPath) { + // If there's a trailing slash, remove it. + if (/\/$/.test(dir)) { + dir = dir.slice(0, dir.length - 1); + } + var fileList = shelljs.find(dir).filter(function(a) { return !IGNORE_PATH_FOR_PUSH_REGEXP.exec(a) && !fs.statSync(a).isDirectory(); }); @@ -254,7 +259,7 @@ PushSession.prototype.doFileSync_ = function() { .then(pushNextFile); }).then(function() { if (deleteList.length > 0) { - return self.harnessClient_.deleteFiles(self.appType_, deleteList, self.assetManifestEtag_) + return self.harnessClient_.deleteFiles(self.appId_, deleteList, self.assetManifestEtag_) .then(self.boundUpdateAssetManifestFn_); } });
