Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-25 20:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "prompts: more concise way of getting the hostname."

Browse source 
This reverts commit 233c443694.

See discussion in https://github.com/fish-shell/fish-shell/pull/2489
This commit is contained in:
David Adam 2015-10-16 07:01:12 +08:00
parent b7e991c4b7
commit b776327b9d
12 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
share/functions/fish_fallback_prompt.fish
View file

@ -5,7 +5,7 @@
function fish_fallback_prompt --description "A simple fallback prompt without too much color or special characters for linux VTs" function fish_fallback_prompt --description "A simple fallback prompt without too much color or special characters for linux VTs"
# Just calculate this 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 (uname -n) set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
end end
set -l color_cwd set -l color_cwd

2
share/functions/fish_prompt.fish
View file

@ -5,7 +5,7 @@
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 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 (uname -n) set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
end end
set -l color_cwd set -l color_cwd

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

@ -2,7 +2,7 @@
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 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 (uname -n) set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
end end
set -l color_cwd set -l color_cwd

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

@ -7,7 +7,7 @@ function fish_prompt --description 'Write out the prompt'
# Just calculate this 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 (uname -n) set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
end end
set -l normal (set_color normal) set -l normal (set_color normal)

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

@ -12,7 +12,7 @@ function fish_prompt --description "Write out the prompt"
# Just calculate this 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 (uname -n) set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
end end
set -l color_cwd set -l color_cwd

2
share/tools/web_config/sample_prompts/debian_chroot.fish
View file

@ -5,7 +5,7 @@ function fish_prompt --description 'Write out the prompt, prepending the Debian
# Just calculate these 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 (uname -n) set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
end end
if not set -q __fish_prompt_normal if not set -q __fish_prompt_normal

2
share/tools/web_config/sample_prompts/informative.fish
View file

@ -8,7 +8,7 @@ function fish_prompt --description 'Write out the prompt'
# Just calculate these 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 (uname -n) set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
end end
if not set -q __fish_prompt_normal if not set -q __fish_prompt_normal

2
share/tools/web_config/sample_prompts/lonetwin.fish
View file

@ -4,7 +4,7 @@
function fish_prompt --description 'Write out the prompt' function fish_prompt --description 'Write out the prompt'
# Just calculate these 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 (uname -n) set -g __fish_prompt_hostname (hostname -s)
end end
if not set -q __fish_prompt_normal if not set -q __fish_prompt_normal

2
share/tools/web_config/sample_prompts/pythonista.fish
View file

@ -12,7 +12,7 @@ function fish_prompt
printf ' at ' printf ' at '
set_color magenta set_color magenta
printf '%s' (uname -n) printf '%s' (hostname|cut -d . -f 1)
set_color normal set_color normal
printf ' in ' printf ' in '

4
share/tools/web_config/sample_prompts/screen_savvy.fish
View file

@ -2,8 +2,8 @@
# author: Matthias # author: Matthias
function fish_prompt -d "Write out the prompt" function fish_prompt -d "Write out the prompt"
if test -z $WINDOW if test -z $WINDOW
printf '%s%s@%s%s%s%s%s> ' (set_color yellow) (whoami) (set_color purple) (uname -n) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal) printf '%s%s@%s%s%s%s%s> ' (set_color yellow) (whoami) (set_color purple) (hostname|cut -d . -f 1) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
else else
printf '%s%s@%s%s%s(%s)%s%s%s> ' (set_color yellow) (whoami) (set_color purple) (uname -n) (set_color white) (echo $WINDOW) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal) printf '%s%s@%s%s%s(%s)%s%s%s> ' (set_color yellow) (whoami) (set_color purple) (hostname|cut -d . -f 1) (set_color white) (echo $WINDOW) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
end end
end end

2
share/tools/web_config/sample_prompts/terlar.fish
View file

@ -13,7 +13,7 @@ function fish_prompt --description 'Write out the prompt'
# Host # Host
set_color $fish_color_host set_color $fish_color_host
echo -n (uname -n) echo -n (hostname -s)
set_color normal set_color normal
echo -n ':' echo -n ':'

2
share/tools/web_config/sample_prompts/user_host_path.fish
View file

@ -9,5 +9,5 @@ function fish_prompt -d "Write out the prompt"
case root toor; set prompt_symbol '#' case root toor; set prompt_symbol '#'
case '*'; set prompt_symbol '$' case '*'; set prompt_symbol '$'
end end
printf "[%s@%s %s%s%s]%s " $USER (uname -n) (set_color $fish_color_cwd) $pwd (set_color normal) $prompt_symbol printf "[%s@%s %s%s%s]%s " $USER (hostname -s) (set_color $fish_color_cwd) $pwd (set_color normal) $prompt_symbol
end end