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

More logic cleanup/fixing

Browse Source
This commit is contained in:
Sean Patrick Hagen 2022-06-17 12:21:52 -07:00
parent 1663a155f8
commit 64a6f8ee18
No known key found for this signature in database
GPG Key ID: 618FC6E1C001EE4F
1 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
functions/fish_prompt.fish
View File

@ -36,6 +36,8 @@
# set -g theme_display_nix no # set -g theme_display_nix no
# set -g theme_display_ruby no # set -g theme_display_ruby no
# set -g theme_display_go no # set -g theme_display_go no
# set -g theme_display_go_show_wrong_version yes
# set -g theme_display_go_actual diff
# set -g theme_display_user ssh # set -g theme_display_user ssh
# set -g theme_display_hostname ssh # set -g theme_display_hostname ssh
# set -g theme_display_sudo_user yes # set -g theme_display_sudo_user yes
@ -854,14 +856,8 @@ function __bobthefish_prompt_golang -S -d 'Display current Go information'
set -l go_version set -l go_version
if type -fq asdf if type -fq asdf
set -l asdf_golang_version (asdf current golang 2>/dev/null) set -l asdf_golang_version (asdf current golang 2>/dev/null)
or set -l asdf_golang_version "na"
set -l asdf_go_sdk_version (asdf current go-sdk 2>/dev/null) set -l asdf_go_sdk_version (asdf current go-sdk 2>/dev/null)
or set -l asdf_go_sdk_version "na"
set -l _asdf_plugin
set -l asdf_go_version
set -l asdf_provenance
if [ "$asdf_golang_version" != "na" ] if [ "$asdf_golang_version" != "na" ]
echo "$asdf_golang_version" | read _asdf_plugin asdf_go_version asdf_provenance echo "$asdf_golang_version" | read _asdf_plugin asdf_go_version asdf_provenance
else if [ "$asdf_go_sdk_version" != "na" ] else if [ "$asdf_go_sdk_version" != "na" ]
@ -875,7 +871,6 @@ function __bobthefish_prompt_golang -S -d 'Display current Go information'
set -l cwd (pwd) set -l cwd (pwd)
set -l dir (pwd) set -l dir (pwd)
set -l found_gomod 0 set -l found_gomod 0
set -l no_go_installed 0
set -l gomod_version "0" set -l gomod_version "0"
set -l gomod_file set -l gomod_file
@ -894,36 +889,53 @@ function __bobthefish_prompt_golang -S -d 'Display current Go information'
end end
cd $cwd cd $cwd
if [ -z "$go_version" ] # no go.mod, not in a go project, don't display the prompt
set go_version $gomod_version
end
if test "$found_gomod" -eq "0" if test "$found_gomod" -eq "0"
return return
end end
set -l actual_go_version "0" # check if there's a Go executable
set -l no_go_installed 0
set -l actual_go_version 0
if ! type -fq go if ! type -fq go
set no_go_installed 1 set no_go_installed 1
else else
set actual_go_version (go version | string match -r 'go version go(\\d+\\.\\d+)' -g) set actual_go_version (go version | string match -r 'go version go(\\d+\\.\\d+)' -g)
end end
[ -z "$go_version" ]
and return
set -l high_enough_version 0 set -l high_enough_version 0
if printf "%s\n%s" "$gomod_version" "$actual_go_version" | sort --check=silent --version-sort if test "$no_go_installed" -eq "0"
set high_enough_version 1 if printf "%s\n%s" "$gomod_version" "$actual_go_version" | sort --check=silent --version-sort
end set high_enough_version 1
end
end
__bobthefish_start_segment $color_virtualgo __bobthefish_start_segment $color_virtualgo
echo -ns $go_glyph echo -ns $go_glyph
if test "$high_enough_version" -eq "0"
# the version of go # do we show the version in red if it's not the right version?
__bobthefish_start_segment $color_rvm if [ "$theme_display_go_show_wrong_version" = "yes" ]
end # yes we do, so check if the version is high enough
echo -ns $go_version ' ' if test "$high_enough_version" -eq "0"
# the version of go isn't high enough
__bobthefish_start_segment $color_rvm
end
end
if [ "$theme_display_go_actual" = "yes" ]
echo -ns "$actual_go_version"
else
echo -ns "$gomod_version" ' '
if [ "$theme_display_go_actual" = "diff" ]
if [ "$gomod_version" != "$actual_go_version" ]
if [ "$actual_go_version" = "0" ]
echo -ns "(NA)"
else
echo -ns "($actual_go_version)"
end
end
end
end
end end
function __bobthefish_virtualenv_python_version -S -d 'Get current Python version' function __bobthefish_virtualenv_python_version -S -d 'Get current Python version'