public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

CB-10105: Spot fix for tilde errors on paths.

Browse Source
This commit is contained in:
Joe Bowser 2016-01-11 15:53:00 -08:00
parent 73fd9e4dfa
commit d78ae309f1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/templates/cordova/lib/build.js vendored
View File

@ -88,11 +88,16 @@ function parseOpts(options, resolvedTarget) {
throw new Error('Specified build config file does not exist: ' + buildConfig); throw new Error('Specified build config file does not exist: ' + buildConfig);
} }
events.emit('log', 'Reading build config file: '+ path.resolve(buildConfig)); events.emit('log', 'Reading build config file: '+ path.resolve(buildConfig));
var config = JSON.parse(fs.readFileSync(buildConfig, 'utf8')); var buildjson = fs.readFileSync(buildConfig, 'utf8');
//var config = JSON.parse(fs.readFileSync(buildConfig, 'utf8'));
var config = JSON.parse(buildjson);
if (config.android && config.android[ret.buildType]) { if (config.android && config.android[ret.buildType]) {
var androidInfo = config.android[ret.buildType]; var androidInfo = config.android[ret.buildType];
if(androidInfo.keystore && !packageArgs.keystore) { if(androidInfo.keystore && !packageArgs.keystore) {
if(androidInfo.keystore.substr(0,1) === '~')
androidInfo.keystore = process.env.HOME + androidInfo.keystore.substr(1)
packageArgs.keystore = path.resolve(path.dirname(buildConfig), androidInfo.keystore); packageArgs.keystore = path.resolve(path.dirname(buildConfig), androidInfo.keystore);
events.emit('log', 'Reading the keystore from: ' + packageArgs.keystore);
} }
['alias', 'storePassword', 'password','keystoreType'].forEach(function (key){ ['alias', 'storePassword', 'password','keystoreType'].forEach(function (key){