Skip to content

Commit

Permalink
Merge branch 'main' into actions/tools-update-config.json
Browse files Browse the repository at this point in the history
  • Loading branch information
aduh95 authored May 31, 2024
2 parents af2af99 + 09528a8 commit 317c82e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.idea/

/.yarn/*
!/.yarn/cache
!/.yarn/patches
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ same major line. Should you need to upgrade to a new major, use an explicit
prevent Corepack showing the URL when it needs to download software, or can be
set to `1` to have the URL shown. By default, when Corepack is called
explicitly (e.g. `corepack pnpm …`), it is set to `0`; when Corepack is called
implicitely (e.g. `pnpm …`), it is set to `1`.
implicitly (e.g. `pnpm …`), it is set to `1`.
When standard input is a TTY and no CI environment is detected, Corepack will
ask for user input before starting the download.

Expand Down Expand Up @@ -304,7 +304,8 @@ same major line. Should you need to upgrade to a new major, use an explicit

### Networking

There are a wide variety of networking issues that can occur while running `corepack` commands. Things to check:
There are a wide variety of networking issues that can occur while running
`corepack` commands. Things to check:

- Make sure your network connection is active.
- Make sure the host for your request can be resolved by your DNS; try using
Expand Down
2 changes: 1 addition & 1 deletion sources/commands/Enable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class EnableCommand extends Command<Context> {
static usage = Command.Usage({
description: `Add the Corepack shims to the install directories`,
details: `
When run, this commmand will check whether the shims for the specified package managers can be found with the correct values inside the install directory. If not, or if they don't exist, they will be created.
When run, this command will check whether the shims for the specified package managers can be found with the correct values inside the install directory. If not, or if they don't exist, they will be created.
By default it will locate the install directory by running the equivalent of \`which corepack\`, but this can be tweaked by explicitly passing the install directory via the \`--install-directory\` flag.
`,
Expand Down
2 changes: 1 addition & 1 deletion sources/corepackUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ export async function installVersion(installTarget: string, locator: Locator, {s
const isSingleFile = outputFile !== null;

// In config, yarn berry is expected to be downloaded as a single file,
// and therefore `spec.bin` is an array. However, when dowloaded from
// and therefore `spec.bin` is an array. However, when downloaded from
// custom npm registry as tarball, `bin` should be a map.
// In this case, we ignore the configured `spec.bin`.

Expand Down

0 comments on commit 317c82e

Please sign in to comment.