Archives/oh-my-fish_theme-bobthefish
1
0
Fork 0
mirror of https://github.com/oh-my-fish/theme-bobthefish.git synced 2024-10-27 20:34:23 +00:00
Code Issues Projects Releases Wiki Activity

Defer to prompt_hostname for hostname segment

Browse Source 
As of fish 2.5.0, there's a canonical way to get the current hostname to put in the prompt. Let's use that.

Add a polyfill for fish < 2.5.0.

See #152
This commit is contained in:
Justin Hileman 2018-05-05 05:13:59 -07:00
parent 67bc90d291
commit 2642107093
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fish_prompt.fish
View File

@ -535,6 +535,17 @@ end
# User / hostname info segments # User / hostname info segments
# ============================== # ==============================
# Polyfill for fish < 2.5.0
if not type -q prompt_hostname
if not set -q __bobthefish_prompt_hostname
set -g __bobthefish_prompt_hostname (hostname | string replace -r '\..*' '')
end
function prompt_hostname
echo $__bobthefish_prompt_hostname
end
end
function __bobthefish_prompt_user -S -d 'Display current user and hostname' function __bobthefish_prompt_user -S -d 'Display current user and hostname'
[ "$theme_display_user" = 'yes' -o \( "$theme_display_user" != 'no' -a -n "$SSH_CLIENT" \) -o \( -n "$default_user" -a "$USER" != "$default_user" \) ] [ "$theme_display_user" = 'yes' -o \( "$theme_display_user" != 'no' -a -n "$SSH_CLIENT" \) -o \( -n "$default_user" -a "$USER" != "$default_user" \) ]
and set -l display_user and set -l display_user
@ -547,17 +558,15 @@ function __bobthefish_prompt_user -S -d 'Display current user and hostname'
end end
if set -q display_hostname if set -q display_hostname
set -l IFS .
hostname | read -l hostname __
if set -q display_user if set -q display_user
# reset colors without starting a new segment... # reset colors without starting a new segment...
# (so we can have a bold username and non-bold hostname) # (so we can have a bold username and non-bold hostname)
set_color normal set_color normal
set_color -b $color_hostname[1] $color_hostname[2..-1] set_color -b $color_hostname[1] $color_hostname[2..-1]
echo -ns '@' $hostname echo -ns '@' (prompt_hostname)
else else
__bobthefish_start_segment $color_hostname __bobthefish_start_segment $color_hostname
echo -ns $hostname echo -ns (prompt_hostname)
end end
end end