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/02/24 16:47:32 UTC
spec commit: Fix createmobilespec --thirdpartyplugins not working
when you don't have --android
Repository: cordova-mobile-spec
Updated Branches:
refs/heads/master 420e330ee -> 0e6bc66b0
Fix createmobilespec --thirdpartyplugins not working when you don't have --android
Project: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/commit/0e6bc66b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/tree/0e6bc66b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/diff/0e6bc66b
Branch: refs/heads/master
Commit: 0e6bc66b0cb7b174aa81cd2a66ab8e1bba50ad97
Parents: 420e330
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Feb 24 10:44:57 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Feb 24 10:44:57 2015 -0500
----------------------------------------------------------------------
createmobilespec/createmobilespec.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/blob/0e6bc66b/createmobilespec/createmobilespec.js
----------------------------------------------------------------------
diff --git a/createmobilespec/createmobilespec.js b/createmobilespec/createmobilespec.js
index 6157bd9..5c8ec53 100755
--- a/createmobilespec/createmobilespec.js
+++ b/createmobilespec/createmobilespec.js
@@ -505,8 +505,10 @@ function installPlugins() {
var fbVars = ' --variable APP_ID=value --variable APP_NAME=value';
shelljs.exec(cli + " plugin add " + CORDOVA_REGISTRY_PLUGINS.join(' ') + searchpath + browserifyFlag + mapVars + fbVars);
// Delete duplicate <uses-permission> due to maxSdk (CB-8401)
- shelljs.sed('-i', /{[^{]*(maxSdk|WRITE_EXTERNAL_STORAGE).*?(maxSdk|WRITE_EXTERNAL_STORAGE)[^}]*},/, '', path.join('plugins', 'android.json'));
- shelljs.sed('-i', /<.*(maxSdk|WRITE_EXTERNAL_STORAGE).*(maxSdk|WRITE_EXTERNAL_STORAGE).*>/, '', path.join('platforms', 'android', 'AndroidManifest.xml'));
+ if (argv.android) {
+ shelljs.sed('-i', /{[^{]*(maxSdk|WRITE_EXTERNAL_STORAGE).*?(maxSdk|WRITE_EXTERNAL_STORAGE)[^}]*},/, '', path.join('plugins', 'android.json'));
+ shelljs.sed('-i', /<.*(maxSdk|WRITE_EXTERNAL_STORAGE).*(maxSdk|WRITE_EXTERNAL_STORAGE).*>/, '', path.join('platforms', 'android', 'AndroidManifest.xml'));
+ }
}
if (argv.thirdpartyplugins || argv.telerikplugins) {
shelljs.exec(cli + " plugin add " + TELERIK_VERIFIED_PLUGINS.join(' ') + searchpath + browserifyFlag);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org