mirror of
https://github.com/fish-shell/fish-shell.git
synced 2024-11-25 18:03:37 +08:00
5d135d5556
6902459566 was an attempt to not print
$status twice in the prompt. As a result we print $pipestatus but
not $status, which /usually/ is the same as $pipestatus[-1] --- unless
the builtin "not" is used, which inverts the $status of a job (it does
not alter $pipestatus).
As a result, the default prompt prints unexpected status codes:
~ > not false
~ [1]> not true
~ > not true | true
~ > not false | false
~ [1|1]>
This commit reintroduces printing of $status after $pipestatus, but only
if it is different from $pipestatus[-1].
Additionally, we only print anything at all if the $status is nonzero,
to avoid confusing output on `not false | false`
~ > not false
~ > not true
~ [0] 1> not true | true
~ [0|0] 1> not false | false
~ >
I think this is closer to users' expectations for those cases; they should
not have to think about this implementation detail of the not-statement.
24 lines
1.1 KiB
Fish
24 lines
1.1 KiB
Fish
# name: Informative
|
|
# http://michal.karzynski.pl/blog/2009/11/19/my-informative-shell-prompt/
|
|
|
|
function fish_prompt --description 'Informative prompt'
|
|
#Save the return status of the previous command
|
|
set -l last_pipestatus $pipestatus
|
|
set -l last_status $status
|
|
|
|
switch "$USER"
|
|
case root toor
|
|
printf '%s@%s %s%s%s# ' $USER (prompt_hostname) (set -q fish_color_cwd_root
|
|
and set_color $fish_color_cwd_root
|
|
or set_color $fish_color_cwd) \
|
|
(prompt_pwd) (set_color normal)
|
|
case '*'
|
|
set -l pipestatus_string (__fish_print_pipestatus $last_status "[" "] " "|" (set_color $fish_color_status) \
|
|
(set_color --bold $fish_color_status) $last_pipestatus)
|
|
|
|
printf '[%s] %s%s@%s %s%s %s%s%s \f\r> ' (date "+%H:%M:%S") (set_color brblue) \
|
|
$USER (prompt_hostname) (set_color $fish_color_cwd) $PWD $pipestatus_string \
|
|
(set_color normal)
|
|
end
|
|
end
|