kevin/asdf
1
Fork 0
mirror of https://github.com/asdf-vm/asdf.git synced 2024-11-15 01:28:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid mention of ASDF_NU_DIR (#1660)

Browse Source
This commit is contained in:
Edwin Kofler 2024-01-09 04:25:30 -08:00 committed by GitHub
parent 9591a0ed79
commit dfea89ccc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
asdf.nu
View File

@ -1,14 +1,27 @@
def-env configure-asdf [] { def-env configure-asdf [] {
$env.ASDF_DIR = (
if ($env | get --ignore-errors ASDF_NU_DIR | is-empty) == false {
$env.ASDF_NU_DIR
}
else if ($env | get --ignore-errors ASDF_DIR | is-empty) == false {
$env.ASDF_DIR
} else {
print --stderr "asdf: Either ASDF_NU_DIR or ASDF_DIR must not be empty"
return
}
)
$env.ASDF_DIR = ( if ( $env | get --ignore-errors ASDF_DIR | is-empty ) { $env.ASDF_NU_DIR } else { $env.ASDF_DIR } ) let shims_dir = (
if ( $env | get --ignore-errors ASDF_DATA_DIR | is-empty ) {
let shims_dir = ( if ( $env | get --ignore-errors ASDF_DATA_DIR | is-empty ) { $env.HOME | path join '.asdf' } else { $env.ASDF_DIR } | path join 'shims' ) $env.HOME | path join '.asdf'
} else {
$env.ASDF_DIR
} | path join 'shims'
)
let asdf_bin_dir = ( $env.ASDF_DIR | path join 'bin' ) let asdf_bin_dir = ( $env.ASDF_DIR | path join 'bin' )
$env.PATH = ( $env.PATH | split row (char esep) | where { |p| $p != $shims_dir } | prepend $shims_dir ) $env.PATH = ( $env.PATH | split row (char esep) | where { |p| $p != $shims_dir } | prepend $shims_dir )
$env.PATH = ( $env.PATH | split row (char esep) | where { |p| $p != $asdf_bin_dir } | prepend $asdf_bin_dir ) $env.PATH = ( $env.PATH | split row (char esep) | where { |p| $p != $asdf_bin_dir } | prepend $asdf_bin_dir )
} }
configure-asdf configure-asdf

6
docs/guide/getting-started.md
View File

@ -300,7 +300,7 @@ Add the following to `~/.config/powershell/profile.ps1`:
Add `asdf.nu` to your `~/.config/nushell/config.nu` with: Add `asdf.nu` to your `~/.config/nushell/config.nu` with:
```shell ```shell
"\n$env.ASDF_NU_DIR = ($env.HOME | path join '.asdf')\n source " + ($env.HOME | path join '.asdf/asdf.nu') | save --append $nu.config-path "\n$env.ASDF_DIR = ($env.HOME | path join '.asdf')\n source " + ($env.HOME | path join '.asdf/asdf.nu') | save --append $nu.config-path
``` ```
Completions are automatically configured Completions are automatically configured
@ -311,7 +311,7 @@ Completions are automatically configured
Add `asdf.nu` to your `~/.config/nushell/config.nu` with: Add `asdf.nu` to your `~/.config/nushell/config.nu` with:
```shell ```shell
"\n$env.ASDF_NU_DIR = (brew --prefix asdf | str trim | into string | path join 'libexec')\n source " + (brew --prefix asdf | into string | path join 'libexec/asdf.nu') | save --append $nu.config-path "\n$env.ASDF_DIR = (brew --prefix asdf | str trim | into string | path join 'libexec')\n source " + (brew --prefix asdf | str trim | into string | path join 'libexec/asdf.nu') | save --append $nu.config-path
``` ```
Completions are automatically configured Completions are automatically configured
@ -322,7 +322,7 @@ Completions are automatically configured
Add `asdf.nu` to your `~/.config/nushell/config.nu` with: Add `asdf.nu` to your `~/.config/nushell/config.nu` with:
```shell ```shell
"\n$env.ASDF_NU_DIR = '/opt/asdf-vm/'\n source /opt/asdf-vm/asdf.nu" | save --append $nu.config-path "\n$env.ASDF_DIR = '/opt/asdf-vm/'\n source /opt/asdf-vm/asdf.nu" | save --append $nu.config-path
``` ```
Completions are automatically configured. Completions are automatically configured.

6
docs/pt-br/guide/getting-started.md
View File

@ -297,7 +297,7 @@ Adicione a seguinte linha ao seu `~/.config/powershell/profile.ps1`:
Adicione `asdf.nu` ao seu `~/.config/nushell/config.nu` através do comando: Adicione `asdf.nu` ao seu `~/.config/nushell/config.nu` através do comando:
```shell ```shell
"\n$env.ASDF_NU_DIR = ($env.HOME | path join '.asdf')\n source " + ($env.HOME | path join '.asdf/asdf.nu') | save --append $nu.config-path "\n$env.ASDF_DIR = ($env.HOME | path join '.asdf')\n source " + ($env.HOME | path join '.asdf/asdf.nu') | save --append $nu.config-path
``` ```
Ao concluir atualizará automaticamente Ao concluir atualizará automaticamente
@ -308,7 +308,7 @@ Ao concluir atualizará automaticamente
Adicione `asdf.nu` ao seu `~/.config/nushell/config.nu` através do comando: Adicione `asdf.nu` ao seu `~/.config/nushell/config.nu` através do comando:
```shell ```shell
"\n$env.ASDF_NU_DIR = (brew --prefix asdf | str trim | into string | path join 'libexec')\n source " + (brew --prefix asdf | into string | path join 'libexec/asdf.nu') | save --append $nu.config-path "\n$env.ASDF_DIR = (brew --prefix asdf | str trim | into string | path join 'libexec')\n source " + (brew --prefix asdf | str trim | into string | path join 'libexec/asdf.nu') | save --append $nu.config-path
``` ```
Ao concluir atualizará automaticamente Ao concluir atualizará automaticamente
@ -319,7 +319,7 @@ Ao concluir atualizará automaticamente
Adicione `asdf.nu` ao seu `~/.config/nushell/config.nu` através do comando: Adicione `asdf.nu` ao seu `~/.config/nushell/config.nu` através do comando:
```shell ```shell
"\n$env.ASDF_NU_DIR = '/opt/asdf-vm/'\n source /opt/asdf-vm/asdf.nu" | save --append $nu.config-path "\n$env.ASDF_DIR = '/opt/asdf-vm/'\n source /opt/asdf-vm/asdf.nu" | save --append $nu.config-path
``` ```
Ao concluir atualizará automaticamente Ao concluir atualizará automaticamente

6
docs/zh-hans/guide/getting-started.md
View File

@ -298,7 +298,7 @@ echo -e "\n. \"$(brew --prefix asdf)/libexec/asdf.ps1\"" >> ~/.config/powershell
使用以下命令将 `asdf.nu` 加入到 `~/.config/nushell/config.nu` 文件中： 使用以下命令将 `asdf.nu` 加入到 `~/.config/nushell/config.nu` 文件中：
```shell ```shell
"\n$env.ASDF_NU_DIR = ($env.HOME | path join '.asdf')\n source " + ($env.HOME | path join '.asdf/asdf.nu') | save --append $nu.config-path "\n$env.ASDF_DIR = ($env.HOME | path join '.asdf')\n source " + ($env.HOME | path join '.asdf/asdf.nu') | save --append $nu.config-path
``` ```
补全功能将会自动配置。 补全功能将会自动配置。
@ -309,7 +309,7 @@ echo -e "\n. \"$(brew --prefix asdf)/libexec/asdf.ps1\"" >> ~/.config/powershell
使用以下命令将 `asdf.nu` 加入到 `~/.config/nushell/config.nu` 文件中: 使用以下命令将 `asdf.nu` 加入到 `~/.config/nushell/config.nu` 文件中:
```shell ```shell
"\n$env.ASDF_NU_DIR = (brew --prefix asdf | str trim | into string | path join 'libexec')\n source " + (brew --prefix asdf | into string | path join 'libexec/asdf.nu') | save --append $nu.config-path "\n$env.ASDF_DIR = (brew --prefix asdf | str trim | into string | path join 'libexec')\n source " + (brew --prefix asdf | str trim | into string | path join 'libexec/asdf.nu') | save --append $nu.config-path
``` ```
补全功能将会自动配置。 补全功能将会自动配置。
@ -320,7 +320,7 @@ echo -e "\n. \"$(brew --prefix asdf)/libexec/asdf.ps1\"" >> ~/.config/powershell
使用以下命令将 `asdf.nu` 加入到 `~/.config/nushell/config.nu` 文件中: 使用以下命令将 `asdf.nu` 加入到 `~/.config/nushell/config.nu` 文件中:
```shell ```shell
"\n$env.ASDF_NU_DIR = '/opt/asdf-vm/'\n source /opt/asdf-vm/asdf.nu" | save --append $nu.config-path "\n$env.ASDF_DIR = '/opt/asdf-vm/'\n source /opt/asdf-vm/asdf.nu" | save --append $nu.config-path
``` ```
补全功能将会自动配置。 补全功能将会自动配置。

19
test/asdf_nu.bats
View File

@ -26,7 +26,7 @@ run_nushell() {
hide-env -i asdf hide-env -i asdf
hide-env -i ASDF_DIR hide-env -i ASDF_DIR
\$env.PATH = ( '$(cleaned_path)' | split row ':' ) \$env.PATH = ( '$(cleaned_path)' | split row ':' )
\$env.ASDF_NU_DIR = '$PWD' \$env.ASDF_DIR = '$PWD'
source asdf.nu source asdf.nu
$1" $1"
@ -60,7 +60,7 @@ run_nushell() {
[ "$result" = "" ] [ "$result" = "" ]
} }
@test "retains ASDF_DIR" { @test "retains ASDF_DIR (from ASDF_NU_DIR)" {
run nu -c " run nu -c "
hide-env -i asdf hide-env -i asdf
\$env.ASDF_DIR = ( pwd ) \$env.ASDF_DIR = ( pwd )
@ -75,6 +75,21 @@ run_nushell() {
[ "$output" = "$PWD" ] [ "$output" = "$PWD" ]
} }
@test "retains ASDF_DIR (from ASDF_DIR)" {
run nu -c "
hide-env -i asdf
\$env.ASDF_DIR = ( pwd )
\$env.PATH = ( '$(cleaned_path)' | split row ':' )
\$env.ASDF_DIR = '$PWD'
source asdf.nu
echo \$env.ASDF_DIR"
[ "$status" -eq 0 ]
[ "$output" = "$PWD" ]
}
@test "defines the asdf or main function" { @test "defines the asdf or main function" {
run_nushell "which asdf | get path | to text" run_nushell "which asdf | get path | to text"