Skip to content

Commit 5505d67

Browse files
committed
fix: escape regex of the name-version apt package
1 parent dac7231 commit 5505d67

File tree

7 files changed

+14
-5
lines changed

7 files changed

+14
-5
lines changed

dist/node12/setup_cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node12/setup_cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node16/setup_cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node16/setup_cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"ci-log": "workspace:1.0.0",
6060
"escape-path-with-spaces": "github:aminya/escape-path-with-spaces#d9f81ee649203ddc55783a2f96ada59df06118e3",
6161
"escape-quotes": "^1.0.2",
62+
"escape-string-regexp": "^5.0.0",
6263
"exec-powershell": "workspace:1.0.0",
6364
"execa": "^5.1.1",
6465
"is-url-online": "^1.5.0",

pnpm-lock.yaml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/utils/setup/setupAptPack.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import pathExists from "path-exists"
99
import { promises as fsPromises } from "fs"
1010
const { appendFile } = fsPromises
1111
import execa from "execa"
12+
import escapeRegex from "escape-string-regexp"
1213

1314
let didUpdate: boolean = false
1415
let didInit: boolean = false
@@ -58,7 +59,12 @@ export async function setupAptPack(packages: AptPackage[], update = false): Prom
5859

5960
async function getAptArg(name: string, version: string | undefined) {
6061
if (version !== undefined && version !== "") {
61-
const { stdout } = await execa("apt-cache", ["search", "--names-only", `^${name}-${version}$`])
62+
console.log(`^${escapeRegex(`${name}-${version}`)}$`)
63+
const { stdout } = await execa("apt-cache", [
64+
"search",
65+
"--names-only",
66+
`^${escapeRegex(name)}\-${escapeRegex(version)}$`,
67+
])
6268
if (stdout.trim() !== "") {
6369
return `${name}-${version}`
6470
} else {

0 commit comments

Comments
 (0)