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 fixing

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

44
functions/fish_prompt.fish
View File

@ -868,40 +868,40 @@ function __bobthefish_prompt_golang -S -d 'Display current Go information'
echo "$asdf_go_sdk_version" | read _asdf_plugin asdf_go_version asdf_provenance echo "$asdf_go_sdk_version" | read _asdf_plugin asdf_go_version asdf_provenance
end end
[ (string trim -- "$asdf_provenance") = "$HOME/.tool-versions" ]
and return
set go_version $asdf_go_version set go_version $asdf_go_version
end end
set -l cwd (pwd)
set -l dir (pwd)
set -l found_gomod 0
set -l no_go_installed 0 set -l no_go_installed 0
set -l gomod_version "0" set -l gomod_version "0"
set -l gomod_file
# no version from asdf, check go.mod file
if [ -z "$go_version" ]
set -l cwd (pwd)
set -l dir (pwd)
set -l gomod_file
set -l _gomod
set -l found_gomod 0
# find the closest go.mod # find the closest go.mod
while not test "$dir" = "/" while not test "$dir" = "/"
set gomod_file "$dir/go.mod" set gomod_file "$dir/go.mod"
if test -f "$gomod_file" if test -f "$gomod_file"
cat "$gomod_file" | grep "^go\ " | read _gomod gomod_version set found_gomod 1
break cat "$gomod_file" | grep "^go\ " | read _gomod gomod_version
end break
cd $dir/..
set dir (pwd)
end end
cd $cwd
cd $dir/..
set dir (pwd)
end
cd $cwd
if [ -z "$go_version" ]
set go_version $gomod_version set go_version $gomod_version
end end
if test "$found_gomod" -eq "0"
return
end
set -l actual_go_version "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