From 7d86b7301d328cfa747339d7ba40f089e5ac4f4b Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 28 Oct 2019 15:03:31 -0400 Subject: [PATCH] Fix typo in npmrc patch Signed-off-by: Stephen Gallagher --- 0002-Use-etc-npmrc-for-the-default-configuration.patch | 6 +++--- 0003-Install-both-binaries-and-use-libdir.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/0002-Use-etc-npmrc-for-the-default-configuration.patch b/0002-Use-etc-npmrc-for-the-default-configuration.patch index 21142c1..6d79f42 100644 --- a/0002-Use-etc-npmrc-for-the-default-configuration.patch +++ b/0002-Use-etc-npmrc-for-the-default-configuration.patch @@ -1,4 +1,4 @@ -From 194e21ab7bb3faf34211a0f9474755064cb8d579 Mon Sep 17 00:00:00 2001 +From d5f88f988423c6304549eb2724b05c9344b0b88b Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 28 Oct 2019 13:24:57 -0400 Subject: [PATCH 2/3] Use /etc/npmrc for the default configuration @@ -9,7 +9,7 @@ Signed-off-by: Stephen Gallagher 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/npm/lib/config/defaults.js b/deps/npm/lib/config/defaults.js -index 57d373df1e10c349142e14fa9e4bbc95b7df79e3..c0e2926ac5af12582fa3b4a4a48804fe5a9cea68 100644 +index 57d373df1e10c349142e14fa9e4bbc95b7df79e3..0ffe6aed8562070cd1d021010b13bef30bac8763 100644 --- a/deps/npm/lib/config/defaults.js +++ b/deps/npm/lib/config/defaults.js @@ -153,7 +153,7 @@ Object.defineProperty(exports, 'defaults', {get: function () { @@ -17,7 +17,7 @@ index 57d373df1e10c349142e14fa9e4bbc95b7df79e3..c0e2926ac5af12582fa3b4a4a48804fe global: false, - globalconfig: path.resolve(globalPrefix, 'etc', 'npmrc'), -+ globalconfig: '/etc/npmrc' ++ globalconfig: '/etc/npmrc', 'global-style': false, group: process.platform === 'win32' ? 0 : process.env.SUDO_GID || (process.getgid && process.getgid()), diff --git a/0003-Install-both-binaries-and-use-libdir.patch b/0003-Install-both-binaries-and-use-libdir.patch index 4df28b4..ea3d4b9 100644 --- a/0003-Install-both-binaries-and-use-libdir.patch +++ b/0003-Install-both-binaries-and-use-libdir.patch @@ -1,4 +1,4 @@ -From 68a68c00f78bade05487d34412f3a4b773c4363e Mon Sep 17 00:00:00 2001 +From 5bfeffdf4b5de1c60a2ff0d1ddf65db2bb9a1533 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 19 Mar 2019 23:22:40 -0400 Subject: [PATCH 3/3] Install both binaries and use libdir.