Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
Files
c25e4c3c3242517c94de2de30f69abd6b428e094
MINGW-packages/mingw-w64-nodejs/0013-Revert-to-FHS-installation-paths-on-Windows-tests-no.patch
Raed Rizqie e453406fef nodejs: update to 23.1.0
2024-11-09 17:50:52 +01:00

881 lines
34 KiB
Diff
Raw Blame History

From bcee3d1a11b3cfdb3e2cf970674b10829b9cf293 Mon Sep 17 00:00:00 2001
From: Mateusz Mikula <mati865@gmail.com>
Date: Sat, 24 Jun 2017 13:59:32 +0200
Subject: [PATCH 13/23] Revert to FHS installation paths on Windows (tests not
fixed)
Author: Mateusz Mikula <mati865@gmail.com>
---
deps/corepack/shims/corepack | 6 +++---
deps/corepack/shims/corepack.ps1 | 8 ++++----
deps/corepack/shims/nodewin/corepack | 6 +++---
deps/corepack/shims/nodewin/corepack.ps1 | 8 ++++----
deps/corepack/shims/nodewin/npm | 6 +++---
deps/corepack/shims/nodewin/npm.ps1 | 8 ++++----
deps/corepack/shims/nodewin/npx | 6 +++---
deps/corepack/shims/nodewin/npx.ps1 | 8 ++++----
deps/corepack/shims/nodewin/pnpm | 6 +++---
deps/corepack/shims/nodewin/pnpm.ps1 | 8 ++++----
deps/corepack/shims/nodewin/pnpx | 6 +++---
deps/corepack/shims/nodewin/pnpx.ps1 | 8 ++++----
deps/corepack/shims/nodewin/yarn | 6 +++---
deps/corepack/shims/nodewin/yarn.ps1 | 8 ++++----
deps/corepack/shims/nodewin/yarnpkg | 6 +++---
deps/corepack/shims/nodewin/yarnpkg.ps1 | 8 ++++----
deps/corepack/shims/npm | 6 +++---
deps/corepack/shims/npm.ps1 | 8 ++++----
deps/corepack/shims/npx | 6 +++---
deps/corepack/shims/npx.ps1 | 8 ++++----
deps/corepack/shims/pnpm | 6 +++---
deps/corepack/shims/pnpm.ps1 | 8 ++++----
deps/corepack/shims/pnpx | 6 +++---
deps/corepack/shims/pnpx.ps1 | 8 ++++----
deps/corepack/shims/yarn | 6 +++---
deps/corepack/shims/yarn.ps1 | 8 ++++----
deps/corepack/shims/yarnpkg | 6 +++---
deps/corepack/shims/yarnpkg.ps1 | 8 ++++----
deps/npm/bin/corepack | 21 +++++++++++++++++++++
deps/npm/bin/corepack.cmd | 7 +++++++
deps/npm/bin/node-gyp-bin/node-gyp | 2 +-
deps/npm/bin/node-gyp-bin/node-gyp.cmd | 2 +-
deps/npm/bin/npm | 10 +++++-----
deps/npm/bin/npm.cmd | 6 +++---
deps/npm/bin/npx | 10 +++++-----
deps/npm/bin/npx.cmd | 6 +++---
deps/npm/lib/npm.js | 5 +++--
37 files changed, 147 insertions(+), 118 deletions(-)
diff --git a/deps/corepack/shims/corepack b/deps/corepack/shims/corepack
index cc659025..65bd62b4 100755
--- a/deps/corepack/shims/corepack
+++ b/deps/corepack/shims/corepack
@@ -2,11 +2,11 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
- exec "$basedir/node" "$basedir/../dist/corepack.js" "$@"
+ exec "$basedir/node" "$basedir/../lib/node_modules/corepack/dist/corepack.js" "$@"
else
- exec node "$basedir/../dist/corepack.js" "$@"
+ exec node "$basedir/../lib/node_modules/corepack/dist/corepack.js" "$@"
fi
diff --git a/deps/corepack/shims/corepack.ps1 b/deps/corepack/shims/corepack.ps1
index c3b027b7..a156f5ea 100755
--- a/deps/corepack/shims/corepack.ps1
+++ b/deps/corepack/shims/corepack.ps1
@@ -11,17 +11,17 @@ $ret=0
if (Test-Path "$basedir/node$exe") {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "$basedir/node$exe" "$basedir/../dist/corepack.js" $args
+ $input | & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/corepack.js" $args
} else {
- & "$basedir/node$exe" "$basedir/../dist/corepack.js" $args
+ & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/corepack.js" $args
}
$ret=$LASTEXITCODE
} else {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "node$exe" "$basedir/../dist/corepack.js" $args
+ $input | & "node$exe" "$basedir/../lib/node_modules/corepack/dist/corepack.js" $args
} else {
- & "node$exe" "$basedir/../dist/corepack.js" $args
+ & "node$exe" "$basedir/../lib/node_modules/corepack/dist/corepack.js" $args
}
$ret=$LASTEXITCODE
}
diff --git a/deps/corepack/shims/nodewin/corepack b/deps/corepack/shims/nodewin/corepack
index 04fc5cc3..65bd62b4 100644
--- a/deps/corepack/shims/nodewin/corepack
+++ b/deps/corepack/shims/nodewin/corepack
@@ -2,11 +2,11 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
- exec "$basedir/node" "$basedir/node_modules/corepack/dist/corepack.js" "$@"
+ exec "$basedir/node" "$basedir/../lib/node_modules/corepack/dist/corepack.js" "$@"
else
- exec node "$basedir/node_modules/corepack/dist/corepack.js" "$@"
+ exec node "$basedir/../lib/node_modules/corepack/dist/corepack.js" "$@"
fi
diff --git a/deps/corepack/shims/nodewin/corepack.ps1 b/deps/corepack/shims/nodewin/corepack.ps1
index 4bed6916..a156f5ea 100644
--- a/deps/corepack/shims/nodewin/corepack.ps1
+++ b/deps/corepack/shims/nodewin/corepack.ps1
@@ -11,17 +11,17 @@ $ret=0
if (Test-Path "$basedir/node$exe") {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "$basedir/node$exe" "$basedir/node_modules/corepack/dist/corepack.js" $args
+ $input | & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/corepack.js" $args
} else {
- & "$basedir/node$exe" "$basedir/node_modules/corepack/dist/corepack.js" $args
+ & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/corepack.js" $args
}
$ret=$LASTEXITCODE
} else {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "node$exe" "$basedir/node_modules/corepack/dist/corepack.js" $args
+ $input | & "node$exe" "$basedir/../lib/node_modules/corepack/dist/corepack.js" $args
} else {
- & "node$exe" "$basedir/node_modules/corepack/dist/corepack.js" $args
+ & "node$exe" "$basedir/../lib/node_modules/corepack/dist/corepack.js" $args
}
$ret=$LASTEXITCODE
}
diff --git a/deps/corepack/shims/nodewin/npm b/deps/corepack/shims/nodewin/npm
index 9beab779..83be92f9 100644
--- a/deps/corepack/shims/nodewin/npm
+++ b/deps/corepack/shims/nodewin/npm
@@ -2,11 +2,11 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
- exec "$basedir/node" "$basedir/node_modules/corepack/dist/npm.js" "$@"
+ exec "$basedir/node" "$basedir/../lib/node_modules/corepack/dist/npm.js" "$@"
else
- exec node "$basedir/node_modules/corepack/dist/npm.js" "$@"
+ exec node "$basedir/../lib/node_modules/corepack/dist/npm.js" "$@"
fi
diff --git a/deps/corepack/shims/nodewin/npm.ps1 b/deps/corepack/shims/nodewin/npm.ps1
index 53fa7e42..22794810 100644
--- a/deps/corepack/shims/nodewin/npm.ps1
+++ b/deps/corepack/shims/nodewin/npm.ps1
@@ -11,17 +11,17 @@ $ret=0
if (Test-Path "$basedir/node$exe") {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "$basedir/node$exe" "$basedir/node_modules/corepack/dist/npm.js" $args
+ $input | & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/npm.js" $args
} else {
- & "$basedir/node$exe" "$basedir/node_modules/corepack/dist/npm.js" $args
+ & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/npm.js" $args
}
$ret=$LASTEXITCODE
} else {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "node$exe" "$basedir/node_modules/corepack/dist/npm.js" $args
+ $input | & "node$exe" "$basedir/../lib/node_modules/corepack/dist/npm.js" $args
} else {
- & "node$exe" "$basedir/node_modules/corepack/dist/npm.js" $args
+ & "node$exe" "$basedir/../lib/node_modules/corepack/dist/npm.js" $args
}
$ret=$LASTEXITCODE
}
diff --git a/deps/corepack/shims/nodewin/npx b/deps/corepack/shims/nodewin/npx
index d69ebf30..fef8cf76 100644
--- a/deps/corepack/shims/nodewin/npx
+++ b/deps/corepack/shims/nodewin/npx
@@ -2,11 +2,11 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
- exec "$basedir/node" "$basedir/node_modules/corepack/dist/npx.js" "$@"
+ exec "$basedir/node" "$basedir/../lib/node_modules/corepack/dist/npx.js" "$@"
else
- exec node "$basedir/node_modules/corepack/dist/npx.js" "$@"
+ exec node "$basedir/../lib/node_modules/corepack/dist/npx.js" "$@"
fi
diff --git a/deps/corepack/shims/nodewin/npx.ps1 b/deps/corepack/shims/nodewin/npx.ps1
index 14c08544..e400430b 100644
--- a/deps/corepack/shims/nodewin/npx.ps1
+++ b/deps/corepack/shims/nodewin/npx.ps1
@@ -11,17 +11,17 @@ $ret=0
if (Test-Path "$basedir/node$exe") {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "$basedir/node$exe" "$basedir/node_modules/corepack/dist/npx.js" $args
+ $input | & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/npx.js" $args
} else {
- & "$basedir/node$exe" "$basedir/node_modules/corepack/dist/npx.js" $args
+ & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/npx.js" $args
}
$ret=$LASTEXITCODE
} else {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "node$exe" "$basedir/node_modules/corepack/dist/npx.js" $args
+ $input | & "node$exe" "$basedir/../lib/node_modules/corepack/dist/npx.js" $args
} else {
- & "node$exe" "$basedir/node_modules/corepack/dist/npx.js" $args
+ & "node$exe" "$basedir/../lib/node_modules/corepack/dist/npx.js" $args
}
$ret=$LASTEXITCODE
}
diff --git a/deps/corepack/shims/nodewin/pnpm b/deps/corepack/shims/nodewin/pnpm
index 56e2c729..5db9b420 100644
--- a/deps/corepack/shims/nodewin/pnpm
+++ b/deps/corepack/shims/nodewin/pnpm
@@ -2,11 +2,11 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
- exec "$basedir/node" "$basedir/node_modules/corepack/dist/pnpm.js" "$@"
+ exec "$basedir/node" "$basedir/../lib/node_modules/corepack/dist/pnpm.js" "$@"
else
- exec node "$basedir/node_modules/corepack/dist/pnpm.js" "$@"
+ exec node "$basedir/../lib/node_modules/corepack/dist/pnpm.js" "$@"
fi
diff --git a/deps/corepack/shims/nodewin/pnpm.ps1 b/deps/corepack/shims/nodewin/pnpm.ps1
index 13f0be3b..28bb76d2 100644
--- a/deps/corepack/shims/nodewin/pnpm.ps1
+++ b/deps/corepack/shims/nodewin/pnpm.ps1
@@ -11,17 +11,17 @@ $ret=0
if (Test-Path "$basedir/node$exe") {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "$basedir/node$exe" "$basedir/node_modules/corepack/dist/pnpm.js" $args
+ $input | & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpm.js" $args
} else {
- & "$basedir/node$exe" "$basedir/node_modules/corepack/dist/pnpm.js" $args
+ & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpm.js" $args
}
$ret=$LASTEXITCODE
} else {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "node$exe" "$basedir/node_modules/corepack/dist/pnpm.js" $args
+ $input | & "node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpm.js" $args
} else {
- & "node$exe" "$basedir/node_modules/corepack/dist/pnpm.js" $args
+ & "node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpm.js" $args
}
$ret=$LASTEXITCODE
}
diff --git a/deps/corepack/shims/nodewin/pnpx b/deps/corepack/shims/nodewin/pnpx
index 604d099f..3e37cd41 100644
--- a/deps/corepack/shims/nodewin/pnpx
+++ b/deps/corepack/shims/nodewin/pnpx
@@ -2,11 +2,11 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
- exec "$basedir/node" "$basedir/node_modules/corepack/dist/pnpx.js" "$@"
+ exec "$basedir/node" "$basedir/../lib/node_modules/corepack/dist/pnpx.js" "$@"
else
- exec node "$basedir/node_modules/corepack/dist/pnpx.js" "$@"
+ exec node "$basedir/../lib/node_modules/corepack/dist/pnpx.js" "$@"
fi
diff --git a/deps/corepack/shims/nodewin/pnpx.ps1 b/deps/corepack/shims/nodewin/pnpx.ps1
index a25e07e5..600c7dd3 100644
--- a/deps/corepack/shims/nodewin/pnpx.ps1
+++ b/deps/corepack/shims/nodewin/pnpx.ps1
@@ -11,17 +11,17 @@ $ret=0
if (Test-Path "$basedir/node$exe") {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "$basedir/node$exe" "$basedir/node_modules/corepack/dist/pnpx.js" $args
+ $input | & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpx.js" $args
} else {
- & "$basedir/node$exe" "$basedir/node_modules/corepack/dist/pnpx.js" $args
+ & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpx.js" $args
}
$ret=$LASTEXITCODE
} else {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "node$exe" "$basedir/node_modules/corepack/dist/pnpx.js" $args
+ $input | & "node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpx.js" $args
} else {
- & "node$exe" "$basedir/node_modules/corepack/dist/pnpx.js" $args
+ & "node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpx.js" $args
}
$ret=$LASTEXITCODE
}
diff --git a/deps/corepack/shims/nodewin/yarn b/deps/corepack/shims/nodewin/yarn
index 9e2bd49f..968c5e2d 100644
--- a/deps/corepack/shims/nodewin/yarn
+++ b/deps/corepack/shims/nodewin/yarn
@@ -2,11 +2,11 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
- exec "$basedir/node" "$basedir/node_modules/corepack/dist/yarn.js" "$@"
+ exec "$basedir/node" "$basedir/../lib/node_modules/corepack/dist/yarn.js" "$@"
else
- exec node "$basedir/node_modules/corepack/dist/yarn.js" "$@"
+ exec node "$basedir/../lib/node_modules/corepack/dist/yarn.js" "$@"
fi
diff --git a/deps/corepack/shims/nodewin/yarn.ps1 b/deps/corepack/shims/nodewin/yarn.ps1
index 2af2b447..03b09a7d 100644
--- a/deps/corepack/shims/nodewin/yarn.ps1
+++ b/deps/corepack/shims/nodewin/yarn.ps1
@@ -11,17 +11,17 @@ $ret=0
if (Test-Path "$basedir/node$exe") {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "$basedir/node$exe" "$basedir/node_modules/corepack/dist/yarn.js" $args
+ $input | & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/yarn.js" $args
} else {
- & "$basedir/node$exe" "$basedir/node_modules/corepack/dist/yarn.js" $args
+ & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/yarn.js" $args
}
$ret=$LASTEXITCODE
} else {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "node$exe" "$basedir/node_modules/corepack/dist/yarn.js" $args
+ $input | & "node$exe" "$basedir/../lib/node_modules/corepack/dist/yarn.js" $args
} else {
- & "node$exe" "$basedir/node_modules/corepack/dist/yarn.js" $args
+ & "node$exe" "$basedir/../lib/node_modules/corepack/dist/yarn.js" $args
}
$ret=$LASTEXITCODE
}
diff --git a/deps/corepack/shims/nodewin/yarnpkg b/deps/corepack/shims/nodewin/yarnpkg
index 05a94b53..147ff923 100644
--- a/deps/corepack/shims/nodewin/yarnpkg
+++ b/deps/corepack/shims/nodewin/yarnpkg
@@ -2,11 +2,11 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
- exec "$basedir/node" "$basedir/node_modules/corepack/dist/yarnpkg.js" "$@"
+ exec "$basedir/node" "$basedir/../lib/node_modules/corepack/dist/yarnpkg.js" "$@"
else
- exec node "$basedir/node_modules/corepack/dist/yarnpkg.js" "$@"
+ exec node "$basedir/../lib/node_modules/corepack/dist/yarnpkg.js" "$@"
fi
diff --git a/deps/corepack/shims/nodewin/yarnpkg.ps1 b/deps/corepack/shims/nodewin/yarnpkg.ps1
index a6df5d22..8d9dbd7d 100644
--- a/deps/corepack/shims/nodewin/yarnpkg.ps1
+++ b/deps/corepack/shims/nodewin/yarnpkg.ps1
@@ -11,17 +11,17 @@ $ret=0
if (Test-Path "$basedir/node$exe") {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "$basedir/node$exe" "$basedir/node_modules/corepack/dist/yarnpkg.js" $args
+ $input | & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/yarnpkg.js" $args
} else {
- & "$basedir/node$exe" "$basedir/node_modules/corepack/dist/yarnpkg.js" $args
+ & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/yarnpkg.js" $args
}
$ret=$LASTEXITCODE
} else {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "node$exe" "$basedir/node_modules/corepack/dist/yarnpkg.js" $args
+ $input | & "node$exe" "$basedir/../lib/node_modules/corepack/dist/yarnpkg.js" $args
} else {
- & "node$exe" "$basedir/node_modules/corepack/dist/yarnpkg.js" $args
+ & "node$exe" "$basedir/../lib/node_modules/corepack/dist/yarnpkg.js" $args
}
$ret=$LASTEXITCODE
}
diff --git a/deps/corepack/shims/npm b/deps/corepack/shims/npm
index 79afda0c..83be92f9 100755
--- a/deps/corepack/shims/npm
+++ b/deps/corepack/shims/npm
@@ -2,11 +2,11 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
- exec "$basedir/node" "$basedir/../dist/npm.js" "$@"
+ exec "$basedir/node" "$basedir/../lib/node_modules/corepack/dist/npm.js" "$@"
else
- exec node "$basedir/../dist/npm.js" "$@"
+ exec node "$basedir/../lib/node_modules/corepack/dist/npm.js" "$@"
fi
diff --git a/deps/corepack/shims/npm.ps1 b/deps/corepack/shims/npm.ps1
index 3f6d6516..22794810 100755
--- a/deps/corepack/shims/npm.ps1
+++ b/deps/corepack/shims/npm.ps1
@@ -11,17 +11,17 @@ $ret=0
if (Test-Path "$basedir/node$exe") {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "$basedir/node$exe" "$basedir/../dist/npm.js" $args
+ $input | & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/npm.js" $args
} else {
- & "$basedir/node$exe" "$basedir/../dist/npm.js" $args
+ & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/npm.js" $args
}
$ret=$LASTEXITCODE
} else {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "node$exe" "$basedir/../dist/npm.js" $args
+ $input | & "node$exe" "$basedir/../lib/node_modules/corepack/dist/npm.js" $args
} else {
- & "node$exe" "$basedir/../dist/npm.js" $args
+ & "node$exe" "$basedir/../lib/node_modules/corepack/dist/npm.js" $args
}
$ret=$LASTEXITCODE
}
diff --git a/deps/corepack/shims/npx b/deps/corepack/shims/npx
index 68baa2cd..fef8cf76 100755
--- a/deps/corepack/shims/npx
+++ b/deps/corepack/shims/npx
@@ -2,11 +2,11 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
- exec "$basedir/node" "$basedir/../dist/npx.js" "$@"
+ exec "$basedir/node" "$basedir/../lib/node_modules/corepack/dist/npx.js" "$@"
else
- exec node "$basedir/../dist/npx.js" "$@"
+ exec node "$basedir/../lib/node_modules/corepack/dist/npx.js" "$@"
fi
diff --git a/deps/corepack/shims/npx.ps1 b/deps/corepack/shims/npx.ps1
index 950c2212..e400430b 100755
--- a/deps/corepack/shims/npx.ps1
+++ b/deps/corepack/shims/npx.ps1
@@ -11,17 +11,17 @@ $ret=0
if (Test-Path "$basedir/node$exe") {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "$basedir/node$exe" "$basedir/../dist/npx.js" $args
+ $input | & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/npx.js" $args
} else {
- & "$basedir/node$exe" "$basedir/../dist/npx.js" $args
+ & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/npx.js" $args
}
$ret=$LASTEXITCODE
} else {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "node$exe" "$basedir/../dist/npx.js" $args
+ $input | & "node$exe" "$basedir/../lib/node_modules/corepack/dist/npx.js" $args
} else {
- & "node$exe" "$basedir/../dist/npx.js" $args
+ & "node$exe" "$basedir/../lib/node_modules/corepack/dist/npx.js" $args
}
$ret=$LASTEXITCODE
}
diff --git a/deps/corepack/shims/pnpm b/deps/corepack/shims/pnpm
index c67c9ae5..5db9b420 100755
--- a/deps/corepack/shims/pnpm
+++ b/deps/corepack/shims/pnpm
@@ -2,11 +2,11 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
- exec "$basedir/node" "$basedir/../dist/pnpm.js" "$@"
+ exec "$basedir/node" "$basedir/../lib/node_modules/corepack/dist/pnpm.js" "$@"
else
- exec node "$basedir/../dist/pnpm.js" "$@"
+ exec node "$basedir/../lib/node_modules/corepack/dist/pnpm.js" "$@"
fi
diff --git a/deps/corepack/shims/pnpm.ps1 b/deps/corepack/shims/pnpm.ps1
index 35046e1e..28bb76d2 100755
--- a/deps/corepack/shims/pnpm.ps1
+++ b/deps/corepack/shims/pnpm.ps1
@@ -11,17 +11,17 @@ $ret=0
if (Test-Path "$basedir/node$exe") {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "$basedir/node$exe" "$basedir/../dist/pnpm.js" $args
+ $input | & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpm.js" $args
} else {
- & "$basedir/node$exe" "$basedir/../dist/pnpm.js" $args
+ & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpm.js" $args
}
$ret=$LASTEXITCODE
} else {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "node$exe" "$basedir/../dist/pnpm.js" $args
+ $input | & "node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpm.js" $args
} else {
- & "node$exe" "$basedir/../dist/pnpm.js" $args
+ & "node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpm.js" $args
}
$ret=$LASTEXITCODE
}
diff --git a/deps/corepack/shims/pnpx b/deps/corepack/shims/pnpx
index 4ea91807..3e37cd41 100755
--- a/deps/corepack/shims/pnpx
+++ b/deps/corepack/shims/pnpx
@@ -2,11 +2,11 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
- exec "$basedir/node" "$basedir/../dist/pnpx.js" "$@"
+ exec "$basedir/node" "$basedir/../lib/node_modules/corepack/dist/pnpx.js" "$@"
else
- exec node "$basedir/../dist/pnpx.js" "$@"
+ exec node "$basedir/../lib/node_modules/corepack/dist/pnpx.js" "$@"
fi
diff --git a/deps/corepack/shims/pnpx.ps1 b/deps/corepack/shims/pnpx.ps1
index 341bb49f..600c7dd3 100755
--- a/deps/corepack/shims/pnpx.ps1
+++ b/deps/corepack/shims/pnpx.ps1
@@ -11,17 +11,17 @@ $ret=0
if (Test-Path "$basedir/node$exe") {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "$basedir/node$exe" "$basedir/../dist/pnpx.js" $args
+ $input | & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpx.js" $args
} else {
- & "$basedir/node$exe" "$basedir/../dist/pnpx.js" $args
+ & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpx.js" $args
}
$ret=$LASTEXITCODE
} else {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "node$exe" "$basedir/../dist/pnpx.js" $args
+ $input | & "node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpx.js" $args
} else {
- & "node$exe" "$basedir/../dist/pnpx.js" $args
+ & "node$exe" "$basedir/../lib/node_modules/corepack/dist/pnpx.js" $args
}
$ret=$LASTEXITCODE
}
diff --git a/deps/corepack/shims/yarn b/deps/corepack/shims/yarn
index 660917d0..968c5e2d 100755
--- a/deps/corepack/shims/yarn
+++ b/deps/corepack/shims/yarn
@@ -2,11 +2,11 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
- exec "$basedir/node" "$basedir/../dist/yarn.js" "$@"
+ exec "$basedir/node" "$basedir/../lib/node_modules/corepack/dist/yarn.js" "$@"
else
- exec node "$basedir/../dist/yarn.js" "$@"
+ exec node "$basedir/../lib/node_modules/corepack/dist/yarn.js" "$@"
fi
diff --git a/deps/corepack/shims/yarn.ps1 b/deps/corepack/shims/yarn.ps1
index f4025460..03b09a7d 100755
--- a/deps/corepack/shims/yarn.ps1
+++ b/deps/corepack/shims/yarn.ps1
@@ -11,17 +11,17 @@ $ret=0
if (Test-Path "$basedir/node$exe") {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "$basedir/node$exe" "$basedir/../dist/yarn.js" $args
+ $input | & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/yarn.js" $args
} else {
- & "$basedir/node$exe" "$basedir/../dist/yarn.js" $args
+ & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/yarn.js" $args
}
$ret=$LASTEXITCODE
} else {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "node$exe" "$basedir/../dist/yarn.js" $args
+ $input | & "node$exe" "$basedir/../lib/node_modules/corepack/dist/yarn.js" $args
} else {
- & "node$exe" "$basedir/../dist/yarn.js" $args
+ & "node$exe" "$basedir/../lib/node_modules/corepack/dist/yarn.js" $args
}
$ret=$LASTEXITCODE
}
diff --git a/deps/corepack/shims/yarnpkg b/deps/corepack/shims/yarnpkg
index 1e24527b..147ff923 100755
--- a/deps/corepack/shims/yarnpkg
+++ b/deps/corepack/shims/yarnpkg
@@ -2,11 +2,11 @@
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ -x "$basedir/node" ]; then
- exec "$basedir/node" "$basedir/../dist/yarnpkg.js" "$@"
+ exec "$basedir/node" "$basedir/../lib/node_modules/corepack/dist/yarnpkg.js" "$@"
else
- exec node "$basedir/../dist/yarnpkg.js" "$@"
+ exec node "$basedir/../lib/node_modules/corepack/dist/yarnpkg.js" "$@"
fi
diff --git a/deps/corepack/shims/yarnpkg.ps1 b/deps/corepack/shims/yarnpkg.ps1
index 825935c0..8d9dbd7d 100755
--- a/deps/corepack/shims/yarnpkg.ps1
+++ b/deps/corepack/shims/yarnpkg.ps1
@@ -11,17 +11,17 @@ $ret=0
if (Test-Path "$basedir/node$exe") {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "$basedir/node$exe" "$basedir/../dist/yarnpkg.js" $args
+ $input | & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/yarnpkg.js" $args
} else {
- & "$basedir/node$exe" "$basedir/../dist/yarnpkg.js" $args
+ & "$basedir/node$exe" "$basedir/../lib/node_modules/corepack/dist/yarnpkg.js" $args
}
$ret=$LASTEXITCODE
} else {
# Support pipeline input
if ($MyInvocation.ExpectingInput) {
- $input | & "node$exe" "$basedir/../dist/yarnpkg.js" $args
+ $input | & "node$exe" "$basedir/../lib/node_modules/corepack/dist/yarnpkg.js" $args
} else {
- & "node$exe" "$basedir/../dist/yarnpkg.js" $args
+ & "node$exe" "$basedir/../lib/node_modules/corepack/dist/yarnpkg.js" $args
}
$ret=$LASTEXITCODE
}
diff --git a/deps/npm/bin/corepack b/deps/npm/bin/corepack
new file mode 100644
index 00000000..cc5c4898
--- /dev/null
+++ b/deps/npm/bin/corepack
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# This is used by the Node.js installer, which expects the cygwin/mingw
+# shell script to already be present in the npm dependency folder.
+(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix
+
+basedir=`dirname "$0"`
+
+case `uname` in
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+NODE_EXE="$basedir/node.exe"
+if ! [ -x "$NODE_EXE" ]; then
+ NODE_EXE="$basedir/node"
+fi
+if ! [ -x "$NODE_EXE" ]; then
+ NODE_EXE=node
+fi
+
+exec "$NODE_EXE" "$basedir/../lib/node_modules/corepack/dist/corepack.js" "$@"
diff --git a/deps/npm/bin/corepack.cmd b/deps/npm/bin/corepack.cmd
new file mode 100644
index 00000000..23fc4d8f
--- /dev/null
+++ b/deps/npm/bin/corepack.cmd
@@ -0,0 +1,7 @@
+@SETLOCAL
+@IF EXIST "%~dp0node.exe" (
+ "%~dp0node.exe" "%~dp0\..\lib\node_modules\corepack\dist\corepack.js" %*
+) ELSE (
+ @SET PATHEXT=%PATHEXT:;.JS;=;%
+ node "%~dp0\..\lib\node_modules\corepack\dist\corepack.js" %*
+)
diff --git a/deps/npm/bin/node-gyp-bin/node-gyp b/deps/npm/bin/node-gyp-bin/node-gyp
index 70efb6f3..9477c013 100755
--- a/deps/npm/bin/node-gyp-bin/node-gyp
+++ b/deps/npm/bin/node-gyp-bin/node-gyp
@@ -1,6 +1,6 @@
#!/usr/bin/env sh
if [ "x$npm_config_node_gyp" = "x" ]; then
- node "`dirname "$0"`/../../node_modules/node-gyp/bin/node-gyp.js" "$@"
+ node "`dirname "$0"`/../lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" "$@"
else
"$npm_config_node_gyp" "$@"
fi
diff --git a/deps/npm/bin/node-gyp-bin/node-gyp.cmd b/deps/npm/bin/node-gyp-bin/node-gyp.cmd
index 083c9c58..e4930302 100755
--- a/deps/npm/bin/node-gyp-bin/node-gyp.cmd
+++ b/deps/npm/bin/node-gyp-bin/node-gyp.cmd
@@ -1,5 +1,5 @@
if not defined npm_config_node_gyp (
- node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
+ node "%~dp0\..\lib\node_modules\npm\node_modules\node-gyp\bin\node-gyp.js" %*
) else (
node "%npm_config_node_gyp%" %*
)
diff --git a/deps/npm/bin/npm b/deps/npm/bin/npm
index 027dc9d1..8818eb4f 100755
--- a/deps/npm/bin/npm
+++ b/deps/npm/bin/npm
@@ -8,7 +8,7 @@
basedir=`dirname "$0"`
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ `uname` = 'Linux' ] && type wslpath &>/dev/null ; then
@@ -41,13 +41,13 @@ if [ $? -ne 0 ]; then
fi
no_node_dir
fi
-NPM_PREFIX_JS="$CLI_BASEDIR/node_modules/npm/bin/npm-prefix.js"
-NPM_CLI_JS="$CLI_BASEDIR/node_modules/npm/bin/npm-cli.js"
+NPM_PREFIX_JS="$CLI_BASEDIR/../lib/node_modules/npm/bin/npm-prefix.js"
+NPM_CLI_JS="$CLI_BASEDIR/../lib/node_modules/npm/bin/npm-cli.js"
NPM_PREFIX=`"$NODE_EXE" "$NPM_PREFIX_JS"`
if [ $? -ne 0 ]; then
no_node_dir
fi
-NPM_PREFIX_NPM_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npm-cli.js"
+NPM_PREFIX_NPM_CLI_JS="$NPM_PREFIX/../lib/node_modules/npm/bin/npm-cli.js"
# a path that will fail -f test on any posix bash
NPM_WSL_PATH="/.."
@@ -62,4 +62,4 @@ if [ -f "$NPM_PREFIX_NPM_CLI_JS" ] || [ -f "$NPM_WSL_PATH" ]; then
NPM_CLI_JS="$NPM_PREFIX_NPM_CLI_JS"
fi
-"$NODE_EXE" "$NPM_CLI_JS" "$@"
+exec "$NODE_EXE" "$NPM_CLI_JS" "$@"
diff --git a/deps/npm/bin/npm.cmd b/deps/npm/bin/npm.cmd
index 1a02e83a..d19ff629 100755
--- a/deps/npm/bin/npm.cmd
+++ b/deps/npm/bin/npm.cmd
@@ -8,10 +8,10 @@ IF NOT EXIST "%NODE_EXE%" (
SET "NODE_EXE=node"
)
-SET "NPM_PREFIX_JS=%~dp0\node_modules\npm\bin\npm-prefix.js"
-SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
+SET "NPM_PREFIX_JS=%~dp0\..\lib\node_modules\npm\bin\npm-prefix.js"
+SET "NPM_CLI_JS=%~dp0\..\lib\node_modules\npm\bin\npm-cli.js"
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_PREFIX_JS%"') DO (
- SET "NPM_PREFIX_NPM_CLI_JS=%%F\node_modules\npm\bin\npm-cli.js"
+ SET "NPM_PREFIX_NPM_CLI_JS=%%F\..\lib\node_modules\npm\bin\npm-cli.js"
)
IF EXIST "%NPM_PREFIX_NPM_CLI_JS%" (
SET "NPM_CLI_JS=%NPM_PREFIX_NPM_CLI_JS%"
diff --git a/deps/npm/bin/npx b/deps/npm/bin/npx
index b8619ee9..81cc8b09 100755
--- a/deps/npm/bin/npx
+++ b/deps/npm/bin/npx
@@ -8,7 +8,7 @@
basedir=`dirname "$0"`
case `uname` in
- *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
esac
if [ `uname` = 'Linux' ] && type wslpath &>/dev/null ; then
@@ -41,13 +41,13 @@ if [ $? -ne 0 ]; then
fi
no_node_dir
fi
-NPM_PREFIX_JS="$CLI_BASEDIR/node_modules/npm/bin/npm-prefix.js"
-NPX_CLI_JS="$CLI_BASEDIR/node_modules/npm/bin/npx-cli.js"
+NPM_PREFIX_JS="$CLI_BASEDIR/../lib/node_modules/npm/bin/npm-prefix.js"
+NPX_CLI_JS="$CLI_BASEDIR/../lib/node_modules/npm/bin/npx-cli.js"
NPM_PREFIX=`"$NODE_EXE" "$NPM_PREFIX_JS"`
if [ $? -ne 0 ]; then
no_node_dir
fi
-NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
+NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/../lib/node_modules/npm/bin/npx-cli.js"
# a path that will fail -f test on any posix bash
NPX_WSL_PATH="/.."
@@ -62,4 +62,4 @@ if [ -f "$NPM_PREFIX_NPX_CLI_JS" ] || [ -f "$NPX_WSL_PATH" ]; then
NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"
fi
-"$NODE_EXE" "$NPX_CLI_JS" "$@"
+exec "$NODE_EXE" "$NPX_CLI_JS" "$@"
diff --git a/deps/npm/bin/npx.cmd b/deps/npm/bin/npx.cmd
index 0f02d2dc..81fdadf9 100755
--- a/deps/npm/bin/npx.cmd
+++ b/deps/npm/bin/npx.cmd
@@ -8,10 +8,10 @@ IF NOT EXIST "%NODE_EXE%" (
SET "NODE_EXE=node"
)
-SET "NPM_PREFIX_JS=%~dp0\node_modules\npm\bin\npm-prefix.js"
-SET "NPX_CLI_JS=%~dp0\node_modules\npm\bin\npx-cli.js"
+SET "NPM_PREFIX_JS=%~dp0\..\lib\node_modules\npm\bin\npm-prefix.js"
+SET "NPX_CLI_JS=%~dp0\..\lib\node_modules\npm\bin\npx-cli.js"
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_PREFIX_JS%"') DO (
- SET "NPM_PREFIX_NPX_CLI_JS=%%F\node_modules\npm\bin\npx-cli.js"
+ SET "NPM_PREFIX_NPX_CLI_JS=%%F\..\lib\node_modules\npm\bin\npx-cli.js"
)
IF EXIST "%NPM_PREFIX_NPX_CLI_JS%" (
SET "NPX_CLI_JS=%NPM_PREFIX_NPX_CLI_JS%"
diff --git a/deps/npm/lib/npm.js b/deps/npm/lib/npm.js
index 893e032f..d6eb3323 100644
--- a/deps/npm/lib/npm.js
+++ b/deps/npm/lib/npm.js
@@ -2,6 +2,7 @@ const { resolve, dirname, join } = require('node:path')
const Config = require('@npmcli/config')
const which = require('which')
const fs = require('node:fs/promises')
+const win = require('os').type() === 'Windows_NT'
const { definitions, flatten, shorthands } = require('@npmcli/config/lib/definitions')
const usage = require('./utils/npm-usage.js')
const LogFile = require('./utils/log-file.js')
@@ -437,7 +438,7 @@ class Npm {
}
get globalDir () {
- return process.platform !== 'win32'
+ return !win
? resolve(this.globalPrefix, 'lib', 'node_modules')
: resolve(this.globalPrefix, 'node_modules')
}
@@ -452,7 +453,7 @@ class Npm {
get globalBin () {
const b = this.globalPrefix
- return process.platform !== 'win32' ? resolve(b, 'bin') : b
+ return !win ? resolve(b, 'bin') : b
}
get localBin () {
--
2.17.0.windows.1
Reference in New Issue View Git Blame Copy Permalink