Skip to content

Commit 2b05907

Browse files
authored
Port Nushell activation scripts to 0.67 (#2386)
1 parent 6ba0c95 commit 2b05907

File tree

3 files changed

+29
-28
lines changed

3 files changed

+29
-28
lines changed

docs/changelog/2386.feature.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update Nushell activation scripts to version 0.67 - by :user:`kubouch`.

src/virtualenv/activation/nushell/activate.nu

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ def-env activate-virtualenv [] {
88
$name in (env).name
99
}
1010

11-
let is-windows = ((sys).host.name | str downcase) == 'windows'
12-
let virtual-env = '__VIRTUAL_ENV__'
11+
let is_windows = ((sys).host.name | str downcase) == 'windows'
12+
let virtual_env = '__VIRTUAL_ENV__'
1313
let bin = '__BIN_NAME__'
14-
let path-sep = '__PATH_SEP__'
15-
let path-name = if $is-windows {
14+
let path_sep = '__PATH_SEP__'
15+
let path_name = if $is_windows {
1616
if (has-env 'Path') {
1717
'Path'
1818
} else {
@@ -22,8 +22,8 @@ def-env activate-virtualenv [] {
2222
'PATH'
2323
}
2424

25-
let old-path = (
26-
if $is-windows {
25+
let old_path = (
26+
if $is_windows {
2727
if (has-env 'Path') {
2828
$env.Path
2929
} else {
@@ -33,24 +33,24 @@ def-env activate-virtualenv [] {
3333
$env.PATH
3434
} | if (is-string $in) {
3535
# if Path/PATH is a string, make it a list
36-
$in | split row $path-sep | path expand
36+
$in | split row $path_sep | path expand
3737
} else {
3838
$in
3939
}
4040
)
4141

42-
let venv-path = ([$virtual-env $bin] | path join)
43-
let new-path = ($old-path | prepend $venv-path | str collect $path-sep)
42+
let venv_path = ([$virtual_env $bin] | path join)
43+
let new_path = ($old_path | prepend $venv_path | str collect $path_sep)
4444

4545
# Creating the new prompt for the session
46-
let virtual-prompt = if ('__VIRTUAL_PROMPT__' == '') {
47-
$'(char lparen)($virtual-env | path basename)(char rparen) '
46+
let virtual_prompt = if ('__VIRTUAL_PROMPT__' == '') {
47+
$'(char lparen)($virtual_env | path basename)(char rparen) '
4848
} else {
4949
'(__VIRTUAL_PROMPT__) '
5050
}
5151

5252
# Back up the old prompt builder
53-
let old-prompt-command = if (has-env 'VIRTUAL_ENV') && (has-env '_OLD_PROMPT_COMMAND') {
53+
let old_prompt_command = if (has-env 'VIRTUAL_ENV') && (has-env '_OLD_PROMPT_COMMAND') {
5454
$env._OLD_PROMPT_COMMAND
5555
} else {
5656
if (has-env 'PROMPT_COMMAND') {
@@ -61,28 +61,28 @@ def-env activate-virtualenv [] {
6161
}
6262

6363
# If there is no default prompt, then only the env is printed in the prompt
64-
let new-prompt = if (has-env 'PROMPT_COMMAND') {
65-
if ($old-prompt-command | describe) == 'block' {
66-
{ $'($virtual-prompt)(do $old-prompt-command)' }
64+
let new_prompt = if (has-env 'PROMPT_COMMAND') {
65+
if ($old_prompt_command | describe) == 'block' {
66+
{ $'($virtual_prompt)(do $old_prompt_command)' }
6767
} else {
68-
{ $'($virtual-prompt)($old-prompt-command)' }
68+
{ $'($virtual_prompt)($old_prompt_command)' }
6969
}
7070
} else {
71-
{ $'($virtual-prompt)' }
71+
{ $'($virtual_prompt)' }
7272
}
7373

7474
# Environment variables that will be batched loaded to the virtual env
75-
let new-env = {
76-
$path-name : $new-path
77-
VIRTUAL_ENV : $virtual-env
78-
_OLD_VIRTUAL_PATH : ($old-path | str collect $path-sep)
79-
_OLD_PROMPT_COMMAND : $old-prompt-command
80-
PROMPT_COMMAND : $new-prompt
81-
VIRTUAL_PROMPT : $virtual-prompt
75+
let new_env = {
76+
$path_name : $new_path
77+
VIRTUAL_ENV : $virtual_env
78+
_OLD_VIRTUAL_PATH : ($old_path | str collect $path_sep)
79+
_OLD_PROMPT_COMMAND : $old_prompt_command
80+
PROMPT_COMMAND : $new_prompt
81+
VIRTUAL_PROMPT : $virtual_prompt
8282
}
8383

8484
# Activate the environment variables
85-
load-env $new-env
85+
load-env $new_env
8686
}
8787

8888
# Activate the virtualenv

src/virtualenv/activation/nushell/deactivate.nu

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ def-env deactivate-virtualenv [] {
33
$name in (env).name
44
}
55

6-
let is-windows = ((sys).host.name | str downcase) == 'windows'
6+
let is_windows = ((sys).host.name | str downcase) == 'windows'
77

8-
let path-name = if $is-windows {
8+
let path_name = if $is_windows {
99
if (has-env 'Path') {
1010
'Path'
1111
} else {
@@ -15,7 +15,7 @@ def-env deactivate-virtualenv [] {
1515
'PATH'
1616
}
1717

18-
load-env { $path-name : $env._OLD_VIRTUAL_PATH }
18+
load-env { $path_name : $env._OLD_VIRTUAL_PATH }
1919

2020
let-env PROMPT_COMMAND = $env._OLD_PROMPT_COMMAND
2121

0 commit comments

Comments
 (0)