From 9f3dd94fc834e9d421bf647e787e1254c7f4b5b5 Mon Sep 17 00:00:00 2001 From: "Yair Manor (Kuszpet)" Date: Thu, 23 Mar 2017 09:03:30 +0200 Subject: [PATCH 1/2] isinstalled.js for Android ignores trailing newlines and is Windows-safe. Fixing issue 13077. Note that patches will still be applied only with a \\n, but git on Windows will correct this after a push/pull depending on autocrlf. --- local-cli/link/android/isInstalled.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local-cli/link/android/isInstalled.js b/local-cli/link/android/isInstalled.js index fda849cf59a3..9daba35fd1cb 100644 --- a/local-cli/link/android/isInstalled.js +++ b/local-cli/link/android/isInstalled.js @@ -4,5 +4,5 @@ const makeBuildPatch = require('./patches/makeBuildPatch'); module.exports = function isInstalled(config, name) { return fs .readFileSync(config.buildGradlePath) - .indexOf(makeBuildPatch(name).patch) > -1; + .indexOf(makeBuildPatch(name).trim().patch) > -1; }; From 108de846d179bceb657d558c89afa94d70098a72 Mon Sep 17 00:00:00 2001 From: "Yair Manor (Kuszpet)" Date: Thu, 23 Mar 2017 09:04:58 +0200 Subject: [PATCH 2/2] Oops... --- local-cli/link/android/isInstalled.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local-cli/link/android/isInstalled.js b/local-cli/link/android/isInstalled.js index 9daba35fd1cb..72cd8368849e 100644 --- a/local-cli/link/android/isInstalled.js +++ b/local-cli/link/android/isInstalled.js @@ -4,5 +4,5 @@ const makeBuildPatch = require('./patches/makeBuildPatch'); module.exports = function isInstalled(config, name) { return fs .readFileSync(config.buildGradlePath) - .indexOf(makeBuildPatch(name).trim().patch) > -1; + .indexOf(makeBuildPatch(name).patch.trim()) > -1; };