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: nushell language syntax update (#1624)

Browse Source 
Co-authored-by: James Hegedus <jthegedus@hey.com>
This commit is contained in:
Lorenz Kitzmann 2023-09-11 13:02:46 +02:00 committed by GitHub
parent c18b60fcd9
commit 0ddab5dfaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asdf.nu
View File

@ -1,14 +1,13 @@
def-env configure-asdf [] { def-env configure-asdf [] {
let-env ASDF_DIR = ( if ( $env | get --ignore-errors ASDF_DIR | is-empty ) { $env.ASDF_NU_DIR } else { $env.ASDF_DIR } ) $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 ) { $env.HOME | path join '.asdf' } else { $env.ASDF_DIR } | path join 'shims' ) 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' )
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 )
let-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 )
let-env PATH = ( $env.PATH | split row (char esep) | where { |p| $p != $asdf_bin_dir } | prepend $asdf_bin_dir )
} }

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
"\nlet-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_NU_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
"\nlet-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_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
``` ```
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
"\nlet-env ASDF_NU_DIR = '/opt/asdf-vm/'\n source /opt/asdf-vm/asdf.nu" | save --append $nu.config-path "\n$env.ASDF_NU_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
"\nlet-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_NU_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
"\nlet-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_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
``` ```
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
"\nlet-env ASDF_NU_DIR = '/opt/asdf-vm/'\n source /opt/asdf-vm/asdf.nu" | save --append $nu.config-path "\n$env.ASDF_NU_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
"\nlet-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_NU_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
"\nlet-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_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
``` ```
补全功能将会自动配置。 补全功能将会自动配置。
@ -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
"\nlet-env ASDF_NU_DIR = '/opt/asdf-vm/'\n source /opt/asdf-vm/asdf.nu" | save --append $nu.config-path "\n$env.ASDF_NU_DIR = '/opt/asdf-vm/'\n source /opt/asdf-vm/asdf.nu" | save --append $nu.config-path
``` ```
补全功能将会自动配置。 补全功能将会自动配置。

2
scripts/install_dependencies.bash
View File

@ -25,7 +25,7 @@ elvish_semver="v0.19.2"
fish_semver="3.6.1" fish_semver="3.6.1"
fish_apt_semver="${fish_semver}-1~jammy" fish_apt_semver="${fish_semver}-1~jammy"
# Nushell # Nushell
nushell_semver="0.78.0" nushell_semver="0.84.0"
# Powershell # Powershell
powershell_semver="7.3.3" powershell_semver="7.3.3"
powershell_apt_semver="${powershell_semver}-1.deb" powershell_apt_semver="${powershell_semver}-1.deb"

10
test/asdf_nu.bats
View File

@ -25,8 +25,8 @@ run_nushell() {
run nu -c " run nu -c "
hide-env -i asdf hide-env -i asdf
hide-env -i ASDF_DIR hide-env -i ASDF_DIR
let-env PATH = ( '$(cleaned_path)' | split row ':' ) \$env.PATH = ( '$(cleaned_path)' | split row ':' )
let-env ASDF_NU_DIR = '$PWD' \$env.ASDF_NU_DIR = '$PWD'
source asdf.nu source asdf.nu
$1" $1"
@ -63,9 +63,9 @@ run_nushell() {
@test "retains ASDF_DIR" { @test "retains ASDF_DIR" {
run nu -c " run nu -c "
hide-env -i asdf hide-env -i asdf
let-env ASDF_DIR = ( pwd ) \$env.ASDF_DIR = ( pwd )
let-env PATH = ( '$(cleaned_path)' | split row ':' ) \$env.PATH = ( '$(cleaned_path)' | split row ':' )
let-env ASDF_NU_DIR = '$PWD' \$env.ASDF_NU_DIR = '$PWD'
source asdf.nu source asdf.nu