mirror of
https://github.com/Llewellynvdm/zoxide.git
synced 2024-11-25 22:17:33 +00:00
Explicitly trim newlines
This commit is contained in:
parent
bc8958943b
commit
9d4c3096df
@ -9,10 +9,8 @@
|
|||||||
|
|
||||||
# Default prompt for Nushell.
|
# Default prompt for Nushell.
|
||||||
def __zoxide_prompt [] {
|
def __zoxide_prompt [] {
|
||||||
let git = $'(do -i {git rev-parse --abbrev-ref HEAD} | str trim)'
|
let git = $'(do -i {git rev-parse --abbrev-ref HEAD} | str trim -rc (char newline))'
|
||||||
let git = (if ($git | str length) == 0 {
|
let git = (if ($git | str length) == 0 { '' } {
|
||||||
''
|
|
||||||
} {
|
|
||||||
build-string (char lparen) (ansi cb) $git (ansi reset) (char rparen)
|
build-string (char lparen) (ansi cb) $git (ansi reset) (char rparen)
|
||||||
})
|
})
|
||||||
build-string (ansi gb) (pwd) (ansi reset) $git '> '
|
build-string (ansi gb) (pwd) (ansi reset) $git '> '
|
||||||
@ -39,7 +37,6 @@ let-env PROMPT_STRING = (
|
|||||||
let prompt = (if ($nu.env | select PROMPT_STRING | empty?) {
|
let prompt = (if ($nu.env | select PROMPT_STRING | empty?) {
|
||||||
if ($nu.config | select prompt | empty?) { '__zoxide_prompt' } { $nu.config.prompt }
|
if ($nu.config | select prompt | empty?) { '__zoxide_prompt' } { $nu.config.prompt }
|
||||||
} { $nu.env.PROMPT_STRING });
|
} { $nu.env.PROMPT_STRING });
|
||||||
|
|
||||||
if ($prompt | str contains '__zoxide_hook') { $prompt } { $'__zoxide_hook;($prompt)' }
|
if ($prompt | str contains '__zoxide_hook') { $prompt } { $'__zoxide_hook;($prompt)' }
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -68,7 +65,7 @@ def __zoxide_z [...rest:string] {
|
|||||||
if ($rest | length) <= 1 && ($arg0 == '-' || ($arg0 | path expand | path exists)) {
|
if ($rest | length) <= 1 && ($arg0 == '-' || ($arg0 | path expand | path exists)) {
|
||||||
cd $arg0
|
cd $arg0
|
||||||
} {
|
} {
|
||||||
cd $'(zoxide query --exclude (pwd) -- $rest | str trim)'
|
cd $'(zoxide query --exclude (pwd) -- $rest | str trim -rc (char newline))'
|
||||||
}
|
}
|
||||||
{%- if echo %}
|
{%- if echo %}
|
||||||
pwd
|
pwd
|
||||||
@ -81,7 +78,7 @@ def __zoxide_zi [...rest:string] {
|
|||||||
if (shells | where active == $true | get name) != filesystem {
|
if (shells | where active == $true | get name) != filesystem {
|
||||||
$'zoxide: can only jump directories on filesystem(char nl)'
|
$'zoxide: can only jump directories on filesystem(char nl)'
|
||||||
} {
|
} {
|
||||||
cd $'(zoxide query -i -- $rest | str trim)'
|
cd $'(zoxide query -i -- $rest | str trim -rc (char newline))'
|
||||||
{%- if echo %}
|
{%- if echo %}
|
||||||
pwd
|
pwd
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
Loading…
Reference in New Issue
Block a user