cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject android commit: CB-10105: Spot fix for tilde errors on paths.
Date Mon, 11 Jan 2016 23:53:07 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/master 73fd9e4df -> d78ae309f


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


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/d78ae309
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/d78ae309
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/d78ae309

Branch: refs/heads/master
Commit: d78ae309f1234cec4f1651a7140508ff1b1dda32
Parents: 73fd9e4
Author: Joe Bowser <bowserj@apache.org>
Authored: Mon Jan 11 15:53:00 2016 -0800
Committer: Joe Bowser <bowserj@apache.org>
Committed: Mon Jan 11 15:53:00 2016 -0800

----------------------------------------------------------------------
 bin/templates/cordova/lib/build.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d78ae309/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index bbf4bd9..694783f 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -88,11 +88,16 @@ function parseOpts(options, resolvedTarget) {
             throw new Error('Specified build config file does not exist: ' + 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]) {
             var androidInfo = config.android[ret.buildType];
             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);
+                events.emit('log', 'Reading the keystore from: ' + packageArgs.keystore);
             }
 
             ['alias', 'storePassword', 'password','keystoreType'].forEach(function (key){


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message