From d3245a43d303b570daed1c2fc828deccbe306441 Mon Sep 17 00:00:00 2001 From: Nikhil Khandelwal Date: Thu, 2 Jul 2015 15:13:31 -0700 Subject: [PATCH] CB-9284 Fix for handling absolute path for keystore in build.json --- bin/templates/cordova/lib/build.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js index 8222c24e..ae154fcc 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){