Skip to content

Commit e36a4e3

Browse files
committed
deps: bin-links@6.0.2
1 parent 91bd674 commit e36a4e3

5 files changed

Lines changed: 21 additions & 14 deletions

File tree

node_modules/bin-links/lib/check-bin.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// either rejects or resolves to nothing. return value not relevant.
33
const isWindows = require('./is-windows.js')
44
const binTarget = require('./bin-target.js')
5-
const { resolve, dirname } = require('path')
5+
const { resolve, dirname, sep } = require('path')
66
const readCmdShim = require('read-cmd-shim')
77
const { readlink } = require('fs/promises')
88

@@ -34,7 +34,9 @@ const checkLink = async ({ target, path }) => {
3434

3535
const resolved = resolve(dirname(target), current)
3636

37-
if (resolved.toLowerCase().indexOf(path.toLowerCase()) !== 0) {
37+
const resolvedLower = resolved.toLowerCase()
38+
const pathLower = path.toLowerCase()
39+
if (resolvedLower !== pathLower && !resolvedLower.startsWith(pathLower + sep)) {
3840
return failEEXIST({ target })
3941
}
4042
}
@@ -65,7 +67,9 @@ const checkShim = async ({ target, path }) => {
6567

6668
const resolved = resolve(dirname(shim), current.replace(/\\/g, '/'))
6769

68-
if (resolved.toLowerCase().indexOf(path.toLowerCase()) !== 0) {
70+
const resolvedLower = resolved.toLowerCase()
71+
const pathLower = path.toLowerCase()
72+
if (resolvedLower !== pathLower && !resolvedLower.startsWith(pathLower + sep)) {
6973
return failEEXIST({ target: shim })
7074
}
7175
}))

node_modules/bin-links/lib/link-gently.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// if there's a symlink already, pointing into our pkg, remove it first
55
// then create the symlink
66

7-
const { resolve, dirname } = require('path')
7+
const { resolve, dirname, sep } = require('path')
88
const { lstat, mkdir, readlink, rm, symlink } = require('fs/promises')
99
const { log } = require('proc-log')
1010
const throwSignificant = er => {
@@ -63,7 +63,7 @@ const linkGently = async ({ path, to, from, absFrom, force }) => {
6363
} // skip it, already set up like we want it.
6464

6565
target = resolve(dirname(to), target)
66-
if (target.indexOf(path) === 0 || force) {
66+
if (target === path || target.startsWith(path + sep) || force) {
6767
return rm(to, rmOpts).then(() => CLOBBER)
6868
}
6969
// neither skip nor clobber

node_modules/bin-links/lib/shim-bin.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { resolve, dirname } = require('path')
1+
const { resolve, dirname, sep } = require('path')
22
const { lstat } = require('fs/promises')
33
const throwNonEnoent = er => {
44
if (er.code !== 'ENOENT') {
@@ -64,7 +64,8 @@ const shimBin = ({ path, to, from, absFrom, force }) => {
6464
return readCmdShim(s)
6565
.then(target => {
6666
target = resolve(dirname(to), target)
67-
if (target.indexOf(resolve(path)) !== 0) {
67+
const base = resolve(path)
68+
if (target !== base && !target.startsWith(base + sep)) {
6869
return failEEXIST({ from, to, path })
6970
}
7071
return false

node_modules/bin-links/package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bin-links",
3-
"version": "6.0.0",
3+
"version": "6.0.2",
44
"description": "JavaScript package binary linker",
55
"main": "./lib/index.js",
66
"scripts": {
@@ -32,7 +32,7 @@
3232
},
3333
"devDependencies": {
3434
"@npmcli/eslint-config": "^5.0.0",
35-
"@npmcli/template-oss": "4.27.1",
35+
"@npmcli/template-oss": "4.30.0",
3636
"require-inject": "^1.4.4",
3737
"tap": "^16.0.1"
3838
},
@@ -55,7 +55,9 @@
5555
"templateOSS": {
5656
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
5757
"windowsCI": false,
58-
"version": "4.27.1",
59-
"publish": true
58+
"version": "4.30.0",
59+
"publish": true,
60+
"updateNpm": false,
61+
"latestCiVersion": 24
6062
}
6163
}

package-lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2958,9 +2958,9 @@
29582958
}
29592959
},
29602960
"node_modules/bin-links": {
2961-
"version": "6.0.0",
2962-
"resolved": "https://registry.npmjs.org/bin-links/-/bin-links-6.0.0.tgz",
2963-
"integrity": "sha512-X4CiKlcV2GjnCMwnKAfbVWpHa++65th9TuzAEYtZoATiOE2DQKhSp4CJlyLoTqdhBKlXjpXjCTYPNNFS33Fi6w==",
2961+
"version": "6.0.2",
2962+
"resolved": "https://registry.npmjs.org/bin-links/-/bin-links-6.0.2.tgz",
2963+
"integrity": "sha512-frE1t78WOwJ45PKV2cF2tNPjTcs9L1J9s6VkrV59wanRP4GlaomuxYPVma7BwthMg8WnfSory4w5PTE6FZZ81w==",
29642964
"license": "ISC",
29652965
"dependencies": {
29662966
"cmd-shim": "^8.0.0",

0 commit comments

Comments
 (0)