From d7b96f7d58cc6ae5adb04177f172175fe385e8d3 Mon Sep 17 00:00:00 2001 From: Ammar Bandukwala Date: Thu, 11 Aug 2022 20:22:06 -0500 Subject: [PATCH] Correct spelling of macOS (#3478) * Correct spelling of macOS * fixup! Correct spelling of macOS * fixup! Correct spelling of macOS --- .github/workflows/coder.yaml | 2 +- .github/workflows/release.yaml | 4 ++-- .github/workflows/typos.toml | 1 + coderd/userpassword/userpassword_test.go | 2 +- docs/ides/web-ides.md | 2 +- docs/install.md | 2 +- docs/quickstart/docker.md | 2 +- docs/workspaces.md | 2 +- examples/templates/docker-with-dotfiles/main.tf | 2 +- install.sh | 2 +- pty/start_other.go | 2 +- 11 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml index f25857fbb0..733dd4d02c 100644 --- a/.github/workflows/coder.yaml +++ b/.github/workflows/coder.yaml @@ -36,7 +36,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: typos-action - uses: crate-ci/typos@v1.0.4 + uses: crate-ci/typos@master with: config: .github/workflows/typos.toml - name: Fix Helper diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c767cc9080..ba57b22024 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -187,10 +187,10 @@ jobs: - name: Install dependencies run: | set -euo pipefail - # The version of bash that MacOS ships with is too old + # The version of bash that macOS ships with is too old brew install bash - # The version of make that MacOS ships with is too old + # The version of make that macOS ships with is too old brew install make echo "$(brew --prefix)/opt/make/libexec/gnubin" >> $GITHUB_PATH diff --git a/.github/workflows/typos.toml b/.github/workflows/typos.toml index 1dbe51ff31..b817f08f44 100644 --- a/.github/workflows/typos.toml +++ b/.github/workflows/typos.toml @@ -2,6 +2,7 @@ alog = "alog" Jetbrains = "JetBrains" IST = "IST" +MacOS = "macOS" [default.extend-words] diff --git a/coderd/userpassword/userpassword_test.go b/coderd/userpassword/userpassword_test.go index a07d2c07ed..6976a94e1c 100644 --- a/coderd/userpassword/userpassword_test.go +++ b/coderd/userpassword/userpassword_test.go @@ -1,4 +1,4 @@ -// This test runs slowly on MacOS instance, and really +// This test runs slowly on macOS instance, and really // only needs to run on Linux anyways. //go:build linux diff --git a/docs/ides/web-ides.md b/docs/ides/web-ides.md index aadaf829cd..058e6130d4 100644 --- a/docs/ides/web-ides.md +++ b/docs/ides/web-ides.md @@ -29,7 +29,7 @@ resource "coder_app" "portainer" { ![code-server in a workspace](../images/code-server-ide.png) -[code-server](https://github.com/coder/coder) is our supported method of running VS Code in the web browser. A simple way to install code-server in Linux/MacOS workspaces is via the Coder agent in your template: +[code-server](https://github.com/coder/coder) is our supported method of running VS Code in the web browser. A simple way to install code-server in Linux/macOS workspaces is via the Coder agent in your template: ```sh # edit your template diff --git a/docs/install.md b/docs/install.md index d9652ad853..d8318ceb23 100644 --- a/docs/install.md +++ b/docs/install.md @@ -112,7 +112,7 @@ We publish self-contained .zip and .tar.gz archives in [GitHub releases](https:/ 1. Unzip the folder you just downloaded, and move the `coder` executable to a location that's on your `PATH` ```sh - # ex. MacOS and Linux + # ex. macOS and Linux mv coder /usr/local/bin ``` diff --git a/docs/quickstart/docker.md b/docs/quickstart/docker.md index 685aa5bcab..36d0d3506d 100644 --- a/docs/quickstart/docker.md +++ b/docs/quickstart/docker.md @@ -8,7 +8,7 @@ Coder with Docker has the following advantages: ## Requirements -- A single MacOS or Linux box +- A single macOS or Linux box - A running Docker daemon ## Instructions diff --git a/docs/workspaces.md b/docs/workspaces.md index 2f38882d20..9560a30dfb 100644 --- a/docs/workspaces.md +++ b/docs/workspaces.md @@ -51,7 +51,7 @@ coder update ## Logging -Coder stores MacOS and Linux logs at the following locations: +Coder stores macOS and Linux logs at the following locations: | Service | Location | | ---------------- | ------------------------------- | diff --git a/examples/templates/docker-with-dotfiles/main.tf b/examples/templates/docker-with-dotfiles/main.tf index 8d002828b2..f8157ae20f 100644 --- a/examples/templates/docker-with-dotfiles/main.tf +++ b/examples/templates/docker-with-dotfiles/main.tf @@ -2,7 +2,7 @@ # dotfiles with Coder templates. # The Docker aspect of the template only works -# with MacOS/Linux amd64 systems. See the full +# with macOS/Linux amd64 systems. See the full # Docker example for details terraform { diff --git a/install.sh b/install.sh index 4c74a7ee50..9e0d7b0e74 100755 --- a/install.sh +++ b/install.sh @@ -388,7 +388,7 @@ install_standalone() { echoh "Installing v$VERSION of the $ARCH release from GitHub." echoh - # MacOS releases are packaged as .zip + # macOS releases are packaged as .zip case $OS in darwin) STANDALONE_ARCHIVE_FORMAT=zip ;; *) STANDALONE_ARCHIVE_FORMAT=tar.gz ;; diff --git a/pty/start_other.go b/pty/start_other.go index 4786f1a365..48a0da2286 100644 --- a/pty/start_other.go +++ b/pty/start_other.go @@ -30,7 +30,7 @@ func startPty(cmd *exec.Cmd) (PTY, Process, error) { _ = ptty.Close() _ = tty.Close() if runtime.GOOS == "darwin" && strings.Contains(err.Error(), "bad file descriptor") { - // MacOS has an obscure issue where the PTY occasionally closes + // macOS has an obscure issue where the PTY occasionally closes // before it's used. It's unknown why this is, but creating a new // TTY resolves it. return startPty(cmd)