You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ti...@apache.org on 2013/08/02 00:27:04 UTC
[5/5] git commit: [CB-4036] - synching up with master and fixed
failing tests
[CB-4036] - synching up with master and fixed failing tests
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/f716822b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/f716822b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/f716822b
Branch: refs/heads/versionCheck
Commit: f716822be87f5e765a8495a62696feabdd99af6e
Parents: c68da5b
Author: Tim Kim <ti...@adobe.com>
Authored: Thu Aug 1 15:08:41 2013 -0700
Committer: Tim Kim <ti...@adobe.com>
Committed: Thu Aug 1 15:08:41 2013 -0700
----------------------------------------------------------------------
src/install.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/f716822b/src/install.js
----------------------------------------------------------------------
diff --git a/src/install.js b/src/install.js
index 7ef27ad..d54ed1d 100644
--- a/src/install.js
+++ b/src/install.js
@@ -103,11 +103,9 @@ function getCurrentProjectVersion(versionPath, platformPath) {
// setting version/platform to null if they do fail or do not exist and then just continuing
var cordovaVersion, platformInfo;
-
- fs.chmodSync(versionPath, '755');
- fs.chmodSync(platformPath, '755');
if (fs.existsSync(versionPath)) {
+ fs.chmodSync(versionPath, '755');
var versionScript = shell.exec(versionPath, {silent: true});
if (versionScript.code === 0) {
cordovaVersion = versionScript.output.trim();
@@ -125,6 +123,7 @@ function getCurrentProjectVersion(versionPath, platformPath) {
}
if (fs.existsSync(platformPath)) {
+ fs.chmodSync(platformPath, '755');
var platformScript = shell.exec(platformPath, {silent: true});
if (platformScript.code === 0) {
// thinking platformScript.output would be a JSON string like:
@@ -156,6 +155,7 @@ function getMinReq(pluginElement, platform){
});
+ // these elements are still in flux - most likely to change when the platforms start implementing these scripts
platformMinOS = pluginElement.findall('./platform[@name="'+platform+'"][@min-os-version]');
platformMinOS = platformMinOS[0] ? platformMinOS[0].attrib["min-os-version"] : null