From 37ceaa14d35182c978172206de73d02abf9b1480 Mon Sep 17 00:00:00 2001
From: hiepxanh <hiepxanh@gmail.com>
Date: Tue, 13 Jul 2021 17:02:09 +0700
Subject: [PATCH] fix(build): support tilde expansion on windows (#563)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Raphael von der Grün <raphinesse@gmail.com>
---
 lib/build.js      | 5 ++---
 package-lock.json | 5 +++++
 package.json      | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/build.js b/lib/build.js
index a5f0a34fb9..1a5c54d43a 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -20,6 +20,7 @@
 var path = require('path');
 var fs = require('fs');
 var nopt = require('nopt');
+const untildify = require('untildify');
 
 var Adb = require('./Adb');
 
@@ -82,9 +83,7 @@ function parseOpts (options, resolvedTarget, projectRoot) {
         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);
-                }
+                androidInfo.keystore = untildify(androidInfo.keystore);
                 packageArgs.keystore = path.resolve(path.dirname(buildConfig), androidInfo.keystore);
                 events.emit('log', 'Reading the keystore from: ' + packageArgs.keystore);
             }
diff --git a/package-lock.json b/package-lock.json
index babbb487af..d7af713758 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3202,6 +3202,11 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
       "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
     },
+    "untildify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw=="
+    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
diff --git a/package.json b/package.json
index f8c124fb42..663ca0526b 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
     "nopt": "^5.0.0",
     "properties-parser": "^0.3.1",
     "semver": "^7.3.5",
+    "untildify": "^4.0.0",
     "which": "^2.0.2"
   },
   "devDependencies": {