From eaf2215cb8adc9c3b74dbcbee034aba8ffa92dda Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Tue, 5 Jul 2022 09:40:33 -0400 Subject: [PATCH] chore: Fix spelling (#1289) chore: Fix spelling --- CHANGELOG.md | 4 ++-- docs/.vuepress/config.js | 2 +- docs/guide/getting-started.md | 2 +- docs/manage/plugins.md | 2 +- lib/commands/command-current.bash | 2 +- lib/utils.bash | 4 ++-- test/banned_commands.bats | 2 +- test/plugin_extension_command.bats | 2 +- test/utils.bats | 2 +- test/version_commands.bats | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5dbf76e..87b91a39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -100,7 +100,7 @@ Fixed Bugs * Fix plugin-update --all when there are no plugins (#805, #803) * Ban `echo` command from asdf codebase (#806, #781) -* Add basic tests for for plugin-update command (#807) +* Add basic tests for plugin-update command (#807) * Cleanup unused code in plugin update tests (#810) * Fix resolution of relative symlinks (#815, #625) * Fixes to GitHub workflow (#833) @@ -185,7 +185,7 @@ Fixed Bugs Extension commands are now expected to be inside plugins's `lib/commands/command-*.bash` instead of `bin/command*`. This change was made for two reasons: Keep the convention that all files to be sourced by bash should end with - the `.bash` extension. And the `lib/commands/` directoy mirrors the location of asdf own core commands. + the `.bash` extension. And the `lib/commands/` directory mirrors the location of asdf own core commands. Added tests to make sure `asdf help` properly displays available extension commands. diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index b995fdd7..41dd0c5d 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -56,7 +56,7 @@ module.exports = { selectLanguageText: "选择语言", sidebar: sidebar.zh_hans, navbar: navbar.zh_hans, - editLinkText: "在 Github 编辑此页面", + editLinkText: "在 GitHub 编辑此页面", // 404 page notFound: ["抱歉，您访问的页面不存在！"], diff --git a/docs/guide/getting-started.md b/docs/guide/getting-started.md index fc56d658..0f9ab6f7 100644 --- a/docs/guide/getting-started.md +++ b/docs/guide/getting-started.md @@ -310,7 +310,7 @@ Some OSs already have tools installed that are managed by the system and not `as ### Local -Local versions are defined in the `$PWD/.tool-versions` file (your current working directory). Usually, this will be the Git respository for a project. When in your desired directory execute: +Local versions are defined in the `$PWD/.tool-versions` file (your current working directory). Usually, this will be the Git repository for a project. When in your desired directory execute: ```shell:no-line-numbers asdf local nodejs latest diff --git a/docs/manage/plugins.md b/docs/manage/plugins.md index 9e63bfeb..ca0182e4 100644 --- a/docs/manage/plugins.md +++ b/docs/manage/plugins.md @@ -82,5 +82,5 @@ The short-name repo is synced to your local machine and periodically refreshed. - `asdf plugin add ` - `asdf plugin list all` - if configuration option `disable_plugin_short_name_repository` is set to `yes`, then sync is aborted early. See the [asdf config docs](/manage/configuration.md) for more. -- if there has not been a synchroniztion in the last `X` minutes then the sync will occur. +- if there has not been a synchronization in the last `X` minutes then the sync will occur. - `X` defaults to `60`, but can be configured in your `.asdfrc` via the `plugin_repository_last_check_duration` option. See the [asdf config docs](/manage/configuration.md) for more. diff --git a/lib/commands/command-current.bash b/lib/commands/command-current.bash index e15bf6e4..fe30f1f8 100644 --- a/lib/commands/command-current.bash +++ b/lib/commands/command-current.bash @@ -48,7 +48,7 @@ current_command() { local exit_status=0 local plugin - # printf "$terminal_format" "PLUGIN" "VERSION" "SET BY CONFIG" # disbale this until we release headings across the board + # printf "$terminal_format" "PLUGIN" "VERSION" "SET BY CONFIG" # disable this until we release headings across the board if [ $# -eq 0 ]; then # shellcheck disable=SC2119 for plugin in $(plugin_list_command); do diff --git a/lib/utils.bash b/lib/utils.bash index 941d7bca..5543754f 100644 --- a/lib/utils.bash +++ b/lib/utils.bash @@ -653,7 +653,7 @@ strip_tool_version_comments() { local tool_version_path="$1" # Use sed to strip comments from the tool version file # Breakdown of sed command: - # This command represents 3 steps, seperated by a semi-colon (;), that run on each line. + # This command represents 3 steps, separated by a semi-colon (;), that run on each line. # 1. Delete line if it starts with any blankspace and a #. # 2. Find a # and delete it and everything after the #. # 3. Remove any whitespace from the end of the line. @@ -820,7 +820,7 @@ with_shim_executable() { } substitute() { - # Use Bash substituion rather than sed as it will handle escaping of all + # Use Bash substitution rather than sed as it will handle escaping of all # strings for us. local input=$1 local find_str=$2 diff --git a/test/banned_commands.bats b/test/banned_commands.bats index 41009124..16ec53fa 100644 --- a/test/banned_commands.bats +++ b/test/banned_commands.bats @@ -42,7 +42,7 @@ banned_commands_regex=( # https://github-wiki-see.page/m/koalaman/shellcheck/wiki/SC2012 '\bls ' - # Ban recusive asdf calls as they are inefficient and may introduce bugs. + # Ban recursive asdf calls as they are inefficient and may introduce bugs. # If you find yourself needing to invoke an `asdf` command from within # asdf code, please source the appropriate file and invoke the # corresponding function. diff --git a/test/plugin_extension_command.bats b/test/plugin_extension_command.bats index dbfdc270..fa5883aa 100644 --- a/test/plugin_extension_command.bats +++ b/test/plugin_extension_command.bats @@ -25,7 +25,7 @@ teardown() { echo "$output" | grep "PLUGIN dummy" # should present plugin section listed_cmds=$(echo "$output" | grep "asdf dummy" | wc -l) [ "$listed_cmds" -eq 3 ] - echo "$output" | grep "asdf dummy foo bar" # should present commands without hipens + echo "$output" | grep "asdf dummy foo bar" # should present commands without hyphens } @test "asdf help shows extension commands for plugin with hyphens in the name" { diff --git a/test/utils.bats b/test/utils.bats index 42cdfc33..715bd336 100644 --- a/test/utils.bats +++ b/test/utils.bats @@ -172,7 +172,7 @@ teardown() { [ "$output" = "0.1.0|$HOME/.tool-versions" ] } -@test "find_versions should return the version set by envrionment variable" { +@test "find_versions should return the version set by environment variable" { export ASDF_DUMMY_VERSION=0.2.0 run find_versions "dummy" $PROJECT_DIR diff --git a/test/version_commands.bats b/test/version_commands.bats index 16837bd1..506d1673 100644 --- a/test/version_commands.bats +++ b/test/version_commands.bats @@ -439,7 +439,7 @@ false" [ "$(cat $HOME/.tool-versions)" = "dummy 1.0.0 2.0.0" ] } -@test "[global - dummy_legcay_plugin] should support latest" { +@test "[global - dummy_legacy_plugin] should support latest" { echo 'legacy-dummy 1.0.0' >>$HOME/.tool-versions run asdf global "legacy-dummy" "1.0.0" "latest" [ "$status" -eq 0 ]