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

Sort out the logic a bit more

Browse Source
This commit is contained in:
Sean Patrick Hagen 2022-06-17 11:41:50 -07:00
parent 9ca1260fc5
commit 4b3197d1b0
No known key found for this signature in database
GPG Key ID: 618FC6E1C001EE4F
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
functions/fish_prompt.fish
View File

@ -875,14 +875,14 @@ function __bobthefish_prompt_golang -S -d 'Display current Go information'
end end
set -l no_go_installed 0 set -l no_go_installed 0
set -l gomod_version "0"
# no version from asdf, check go.mod file # no version from asdf, check go.mod file
if [ -z "$go_version" ] if [ -z "$go_version" ]
set -l cwd (pwd) set -l cwd (pwd)
set -l dir (pwd) set -l dir (pwd)
set -l gomod_file set -l gomod_file
set -l gomod_version
set -l _gomod set -l _gomod
set -l found_gomod 0 set -l found_gomod 0
# find the closest go.mod # find the closest go.mod
@ -890,7 +890,6 @@ function __bobthefish_prompt_golang -S -d 'Display current Go information'
set gomod_file "$dir/go.mod" set gomod_file "$dir/go.mod"
if test -f "$gomod_file" if test -f "$gomod_file"
set found_gomod 1
cat "$gomod_file" | grep "^go\ " | read _gomod gomod_version cat "$gomod_file" | grep "^go\ " | read _gomod gomod_version
break break
end end
@ -900,30 +899,28 @@ function __bobthefish_prompt_golang -S -d 'Display current Go information'
end end
cd $cwd cd $cwd
if test "$found_gomod" -eq "1"
# found go.mod file, but no version inside
if [ -z (string trim -- "$gomod_version") ]
# is there a version of go we can ask for the version?
if type -fq go
set gomod_version (go version | string match -r 'go version go(\\d+\\.\\d+)' -g)
end
end
end
set go_version $gomod_version set go_version $gomod_version
end end
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
set actual_go_version (go version | string match -r 'go version go(\\d+\\.\\d+)' -g)
end end
[ -z "$go_version" ] [ -z "$go_version" ]
and return and return
set -l high_enough_version 0
if printf "%s\n%s" "$gomod_version" "$actual_go_version" | sort --check=silent --version-sort
set high_enough_version 1
end
__bobthefish_start_segment $color_virtualgo __bobthefish_start_segment $color_virtualgo
echo -ns $go_glyph echo -ns $go_glyph
if test "$no_go_installed" -eq "1" if test "$high_enough_version" -eq "0"
# we got a version of go from a go.mod file, but no version of go is installed! # the version of go
__bobthefish_start_segment $color_rvm __bobthefish_start_segment $color_rvm
end end
echo -ns $go_version ' ' echo -ns $go_version ' '