Repository: cordova-android Updated Branches: refs/heads/master 90a51c2cc -> d3245a43d
CB-9284 Fix for handling absolute path for keystore in build.json Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/d3245a43 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/d3245a43 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/d3245a43 Branch: refs/heads/master Commit: d3245a43d303b570daed1c2fc828deccbe306441 Parents: 90a51c2 Author: Nikhil Khandelwal <[email protected]> Authored: Thu Jul 2 15:13:31 2015 -0700 Committer: Nikhil Khandelwal <[email protected]> Committed: Thu Jul 2 15:13:31 2015 -0700 ---------------------------------------------------------------------- bin/templates/cordova/lib/build.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d3245a43/bin/templates/cordova/lib/build.js ---------------------------------------------------------------------- diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js index 8222c24..ae154fc 100644 --- a/bin/templates/cordova/lib/build.js +++ b/bin/templates/cordova/lib/build.js @@ -477,8 +477,12 @@ function parseOpts(options, resolvedTarget) { var config = JSON.parse(fs.readFileSync(buildConfig, 'utf8')); if (config.android && config.android[ret.buildType]) { var androidInfo = config.android[ret.buildType]; - if(androidInfo.keystore) { - packageArgs.keystore = packageArgs.keystore || path.relative(ROOT, path.join(path.dirname(buildConfig), androidInfo.keystore)); + if(androidInfo.keystore && !packageArgs.keystore) { + if(path.isAbsolute(androidInfo.keystore)) { + packageArgs.keystore = androidInfo.keystore; + } else { + packageArgs.keystore = path.relative(ROOT, path.join(path.dirname(buildConfig), androidInfo.keystore)); + } } ['alias', 'storePassword', 'password','keystoreType'].forEach(function (key){ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
