Skip to content

Commit

Permalink
Merge branch 'master' into add-unset-all
Browse files Browse the repository at this point in the history
  • Loading branch information
edvardsanta authored Sep 21, 2023
2 parents 672d5ef + 4085e55 commit b64ea50
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 17 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/semantic-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,3 @@ jobs:
- uses: amannn/action-semantic-pull-request@v5.2.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
validateSingleCommit: true
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [0.13.1](https://github.com/asdf-vm/asdf/compare/v0.13.0...v0.13.1) (2023-09-12)


### Patches

* **fish:** use builtin realpath over system one ([#1637](https://github.com/asdf-vm/asdf/issues/1637)) ([5ac3032](https://github.com/asdf-vm/asdf/commit/5ac30328a7bbd1a8d974bb5fb1f14d8bd2d1e03f))

## [0.13.0](https://github.com/asdf-vm/asdf/compare/v0.12.0...v0.13.0) (2023-09-11)


Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ not covered under this security policy.**
<!-- x-release-please-start-version -->

```
0.13.0
0.13.1
```

<!-- x-release-please-end -->
Expand Down
17 changes: 8 additions & 9 deletions bin/asdf
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
set -o pipefail

# shellcheck source=lib/utils.bash
. "$(dirname "$(dirname "$0")")/lib/utils.bash"
Expand Down Expand Up @@ -48,15 +49,13 @@ find_asdf_cmd() {

find_plugin_cmd() {
local ASDF_CMD_FILE args_offset
if [ -d "$(get_plugin_path "$1")/bin" ]; then
local result=
result="$(find_cmd "$(get_plugin_path "$1")/lib/commands" "${@:2}")"
ASDF_CMD_FILE=${result% *}
args_offset=${result##* }
if [ -n "$ASDF_CMD_FILE" ]; then
args_offset=$((args_offset + 1)) # since the first argument is the plugin name
printf "%s %s\n" "$ASDF_CMD_FILE" "$args_offset"
fi
local result=
result="$(find_cmd "$(get_plugin_path "$1")/lib/commands" "${@:2}")"
ASDF_CMD_FILE=${result% *}
args_offset=${result##* }
if [ -n "$ASDF_CMD_FILE" ]; then
args_offset=$((args_offset + 1)) # since the first argument is the plugin name
printf "%s %s\n" "$ASDF_CMD_FILE" "$args_offset"
fi
}

Expand Down
2 changes: 1 addition & 1 deletion docs/guide/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ asdf primarily requires `git` & `curl`. Here is a _non-exhaustive_ list of comma


```shell
git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.13.0
git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.13.1

```

Expand Down
2 changes: 1 addition & 1 deletion docs/pt-br/guide/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ asdf primarily requires `git` & `curl`. Here is a _non-exhaustive_ list of comma
<!-- x-release-please-start-version -->

```shell
git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.13.0
git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.13.1
```

<!-- x-release-please-end -->
Expand Down
2 changes: 1 addition & 1 deletion docs/pt-br/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ features:
- title: Plugins
details: "Grande ecossistema de runtimes e ferramentas existentes. API simples para adicionar suporte para novas ferramentas conforme necessário!"
icon: 🔌
- title: "Compatível com varios arquivos de configuração"
- title: "Compatível com vários arquivos de configuração"
details: "Suporte para arquivos de configuração existentes .nvmrc, .node-versions, .ruby-version para uma migração tranquila!"
icon:
- title: "Só um arquivo de configuração"
Expand Down
2 changes: 1 addition & 1 deletion docs/zh-hans/guide/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ asdf primarily requires `git` & `curl`. Here is a _non-exhaustive_ list of comma
<!-- x-release-please-start-version -->

```shell
git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.13.0
git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.13.1
```

<!-- x-release-please-end -->
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.13.0
0.13.1

0 comments on commit b64ea50

Please sign in to comment.