Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-12 21:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

# This is a combination of 2 commits.

Browse source 
# The first commit's message is:

Simplify default fish_prompt

No need for the set_color caching now that it's a builtin.

Also simplify the 3 classic prompts in fish_config's sample_prompts set.
This commit is contained in:
Kevin Ballard 2014-10-02 14:02:53 -07:00
parent ae7b6156ac
commit 3f11d90744
4 changed files with 96 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
share/functions/fish_prompt.fish
View file

@ -1,40 +1,27 @@
# Set the default prompt command. Make sure that every terminal escape # vim: set noet:
# string has a newline before and after, so that fish will know how #
# long it is. # Set the default prompt command.
function fish_prompt --description "Write out the prompt" function fish_prompt --description "Write out the prompt"
# Just calculate this once, to save a few cycles when displaying the prompt
# Just calculate these once, to save a few cycles when displaying the prompt
if not set -q __fish_prompt_hostname if not set -q __fish_prompt_hostname
set -g __fish_prompt_hostname (hostname|cut -d . -f 1) set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
end end
if not set -q __fish_prompt_normal set -l color_cwd
set -g __fish_prompt_normal (set_color normal) set -l suffix
end
switch $USER switch $USER
case root toor case root toor
if not set -q __fish_prompt_cwd
if set -q fish_color_cwd_root if set -q fish_color_cwd_root
set -g __fish_prompt_cwd (set_color $fish_color_cwd_root) set color_cwd $fish_color_cwd_root
else else
set -g __fish_prompt_cwd (set_color $fish_color_cwd) set color_cwd $fish_color_cwd
end end
end set suffix '#'
echo -n -s "$USER" @ "$__fish_prompt_hostname" ' ' "$__fish_prompt_cwd" (prompt_pwd) "$__fish_prompt_normal" '# '
case '*' case '*'
set color_cwd $fish_color_cwd
if not set -q __fish_prompt_cwd set suffix '>'
set -g __fish_prompt_cwd (set_color $fish_color_cwd)
end end
echo -n -s "$USER" @ "$__fish_prompt_hostname" ' ' "$__fish_prompt_cwd" (prompt_pwd) "$__fish_prompt_normal" '> ' echo -n -s "$USER" @ "$__fish_prompt_hostname" ' ' (set_color $color_cwd) (prompt_pwd) (set_color normal) "$suffix "
end end
end

30
share/tools/web_config/sample_prompts/classic.fish
View file

@ -1,36 +1,24 @@
# name: Classic # name: Classic
function fish_prompt --description "Write out the prompt" function fish_prompt --description "Write out the prompt"
# Just calculate this once, to save a few cycles when displaying the prompt
# Just calculate these once, to save a few cycles when displaying the prompt
if not set -q __fish_prompt_hostname if not set -q __fish_prompt_hostname
set -g __fish_prompt_hostname (hostname|cut -d . -f 1) set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
end end
if not set -q __fish_prompt_normal set -l color_cwd
set -g __fish_prompt_normal (set_color normal) set -l suffix
end
switch $USER switch $USER
case root toor case root toor
if not set -q __fish_prompt_cwd
if set -q fish_color_cwd_root if set -q fish_color_cwd_root
set -g __fish_prompt_cwd (set_color $fish_color_cwd_root) set color_cwd $fish_color_cwd_root
else else
set -g __fish_prompt_cwd (set_color $fish_color_cwd) set color_cwd $fish_color_cwd
end end
end set suffix '#'
echo -n -s "$USER" @ "$__fish_prompt_hostname" ' ' "$__fish_prompt_cwd" (prompt_pwd) "$__fish_prompt_normal" '# '
case '*' case '*'
set color_cwd $fish_color_cwd
if not set -q __fish_prompt_cwd set suffix '>'
set -g __fish_prompt_cwd (set_color $fish_color_cwd)
end end
echo -n -s "$USER" @ "$__fish_prompt_hostname" ' ' "$__fish_prompt_cwd" (prompt_pwd) "$__fish_prompt_normal" '> ' echo -n -s "$USER" @ "$__fish_prompt_hostname" ' ' (set_color $color_cwd) (prompt_pwd) (set_color normal) "$suffix "
end
end end

86
share/tools/web_config/sample_prompts/classic_git.fish
View file

@ -1,91 +1,95 @@
# name: Classic + Git # name: Classic + Git
# author: Kevin Ballard # author: Kevin Ballard
# vim: set noet:
function fish_prompt --description 'Write out the prompt' function fish_prompt --description 'Write out the prompt'
set -l last_status $status set -l last_status $status
# Just calculate these once, to save a few cycles when displaying the prompt # Just calculate this once, to save a few cycles when displaying the prompt
if not set -q __fish_prompt_hostname if not set -q __fish_prompt_hostname
set -g __fish_prompt_hostname (hostname|cut -d . -f 1) set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
end end
if not set -q __fish_prompt_normal set -l normal (set_color normal)
set -g __fish_prompt_normal (set_color normal)
end
# Hack; fish_config only copies the fish_prompt function (see #736)
if not set -q -g __fish_classic_git_functions_defined if not set -q -g __fish_classic_git_functions_defined
set -g __fish_classic_git_functions_defined set -g __fish_classic_git_functions_defined
function __fish_repaint_user --on-variable fish_color_user --description "Event handler, repaint when fish_color_user changes" function __fish_repaint_user --on-variable fish_color_user --description "Event handler, repaint when fish_color_user changes"
if status --is-interactive if status --is-interactive
set -e __fish_prompt_user
commandline -f repaint ^/dev/null commandline -f repaint ^/dev/null
end end
end end
function __fish_repaint_host --on-variable fish_color_host --description "Event handler, repaint when fish_color_host changes" function __fish_repaint_host --on-variable fish_color_host --description "Event handler, repaint when fish_color_host changes"
if status --is-interactive if status --is-interactive
set -e __fish_prompt_host
commandline -f repaint ^/dev/null commandline -f repaint ^/dev/null
end end
end end
function __fish_repaint_status --on-variable fish_color_status --description "Event handler; repaint when fish_color_status changes" function __fish_repaint_status --on-variable fish_color_status --description "Event handler; repaint when fish_color_status changes"
if status --is-interactive if status --is-interactive
set -e __fish_prompt_status
commandline -f repaint ^/dev/null commandline -f repaint ^/dev/null
end end
end end
function __fish_repaint_bind_mode --on-variable fish_key_bindings --description "Event handler; repaint when fish_key_bindings changes"
if status --is-interactive
commandline -f repaint ^/dev/null
end
end end
set -l delim '>' # initialize our new variables
if not set -q __fish_classic_git_prompt_initialized
set -qU fish_color_user; or set -U fish_color_user -o green
set -qU fish_color_host; or set -U fish_color_host -o cyan
set -qU fish_color_status; or set -U fish_color_status red
set -U __fish_classic_git_prompt_initialized
end
end
set -l color_cwd
set -l prefix
switch $USER switch $USER
case root toor case root toor
if not set -q __fish_prompt_cwd
if set -q fish_color_cwd_root if set -q fish_color_cwd_root
set -g __fish_prompt_cwd (set_color $fish_color_cwd_root) set color_cwd $fish_color_cwd_root
else else
set -g __fish_prompt_cwd (set_color $fish_color_cwd) set color_cwd $fish_color_cwd
end end
end set suffix '#'
case '*' case '*'
set color_cwd $fish_color_cwd
if not set -q __fish_prompt_cwd set suffix '>'
set -g __fish_prompt_cwd (set_color $fish_color_cwd)
end
end end
set -l prompt_status set -l prompt_status
if test $last_status -ne 0 if test $last_status -ne 0
if not set -q __fish_prompt_status set prompt_status ' ' (set_color $fish_color_status) "[$last_status]" "$normal"
set -g __fish_prompt_status (set_color $fish_color_status)
end
set prompt_status "$__fish_prompt_status [$last_status]$__fish_prompt_normal"
end end
if not set -q __fish_prompt_user set -l mode_str
set -g __fish_prompt_user (set_color $fish_color_user) switch "$fish_key_bindings"
case '*_vi_*' '*_vi'
# possibly fish_vi_key_bindings, or custom key bindings
# that includes the name "vi"
set mode_str (
echo -n " "
switch $fish_bind_mode
case default
set_color --bold --background red white
echo -n "[N]"
case insert
set_color --bold green
echo -n "[I]"
case visual
set_color --bold magenta
echo -n "[V]"
end end
if not set -q __fish_prompt_host set_color normal
set -g __fish_prompt_host (set_color $fish_color_host) )
end end
echo -n -s "$__fish_prompt_user" "$USER" "$__fish_prompt_normal" @ "$__fish_prompt_host" "$__fish_prompt_hostname" "$__fish_prompt_normal" ' ' "$__fish_prompt_cwd" (prompt_pwd) (__fish_git_prompt) "$__fish_prompt_normal" "$prompt_status" "$delim" ' ' echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $fish_color_host) "$__fish_prompt_hostname" $normal ' ' (set_color $color_cwd) (prompt_pwd) (__fish_git_prompt) $normal $prompt_status "$mode_str" "> "
end
# initialize our new variables
# in theory this would be in a fish_prompt event, but this file isn't sourced
# until the fish_prompt function is called anyway.
if not set -q __prompt_initialized_2
set -U fish_color_user -o green
set -U fish_color_host -o cyan
set -U fish_color_status red
set -U __prompt_initialized_2
end end

33
share/tools/web_config/sample_prompts/classic_status.fish
View file

@ -1,7 +1,7 @@
# name: Classic + Status # name: Classic + Status
# author: David Frascone # author: David Frascone
function fish_prompt --description 'Write out the prompt' function fish_prompt --description "Write out the prompt"
# Save our status # Save our status
set -l last_status $status set -l last_status $status
@ -10,38 +10,25 @@ function fish_prompt --description 'Write out the prompt'
printf "%s(%d)%s " (set_color red --bold) $last_status (set_color normal) printf "%s(%d)%s " (set_color red --bold) $last_status (set_color normal)
end end
# Just calculate these once, to save a few cycles when displaying the prompt # Just calculate this once, to save a few cycles when displaying the prompt
if not set -q __fish_prompt_hostname if not set -q __fish_prompt_hostname
set -g __fish_prompt_hostname (hostname|cut -d . -f 1) set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
end end
if not set -q __fish_prompt_normal set -l color_cwd
set -g __fish_prompt_normal (set_color normal) set -l suffix
end
set -l user_prompt '>'
switch $USER switch $USER
# Set our root colors, if we're root :)
case root toor case root toor
set user_prompt '#'
if not set -q __fish_prompt_cwd
if set -q fish_color_cwd_root if set -q fish_color_cwd_root
set -g __fish_prompt_cwd (set_color $fish_color_cwd_root) set color_cwd $fish_color_cwd_root
else else
set -g __fish_prompt_cwd (set_color $fish_color_cwd) set color_cwd $fish_color_cwd
end
end end
set suffix '#'
case '*' case '*'
if not set -q __fish_prompt_cwd set color_cwd $fish_color_cwd
set -g __fish_prompt_cwd (set_color $fish_color_cwd) set suffix '>'
end
end
#printf '%s@%s %s%s%s# ' $USER $__fish_prompt_hostname "$__fish_prompt_cwd" (prompt_pwd) "$__fish_prompt_normal"
#printf "LAST STATUS STRING: $last_status_string \n"
printf '%s@%s %s%s%s%s%s ' $USER $__fish_prompt_hostname "$__fish_prompt_cwd" (prompt_pwd) "$__fish_prompt_normal" $user_prompt
end end
function fish_title echo -n -s "$USER" @ "$__fish_prompt_hostname" ' ' (set_color $color_cwd) (prompt_pwd) (set_color normal) "$suffix "
echo $_ ' ' (prompt_pwd)
end end