Merge scuba branch

This commit is contained in:
Ilan Cosman 2020-10-26 16:51:07 -07:00
commit ec319f1739
4 changed files with 11 additions and 4 deletions

View File

@ -212,5 +212,5 @@ Most of Tide's git capabilities are inherited from fish's built-in [fish_git_pro
| icon | icon to display in front of virtual_env item | string |
[`set_color`]: https://fishshell.com/docs/current/cmds/set_color.html
[fish_git_prompt]: https://fishshell.com/docs/current/cmds/fish_git_prompt.htmls
[fish_git_prompt]: https://fishshell.com/docs/current/cmds/fish_git_prompt.html
[nvm.fish]: https://github.com/jorgebucaran/nvm.fish

View File

@ -17,6 +17,10 @@ function _tide_detect_os
end
function _tide_detect_os_linux_cases -a file key
if not test -f $file
return 1
end
set -l splitOsRelease (cat $file | string split '=')
set -l value $splitOsRelease[(math (contains --index $key $splitOsRelease)+1)]
set -l name (string trim --chars='"' $value | string lower)

View File

@ -21,9 +21,9 @@ function _tide_sub_test
set -l testsDir "$_tide_dir/tests"
set -l pending '/tmp/tide_test'
set -l failed '/tmp/tide_test_failed'
set -l passed '/tmp/tide_test_passed'
set -l pending (mktemp -u)
set -l failed (mktemp -u)
set -l passed (mktemp -u)
set -l returnStatement 0

View File

@ -16,4 +16,7 @@ end
function fish_right_prompt
printf '%s' $_tide_fish_right_prompt_display
# Right prompt is always the last thing on the line
# therefore reset colors for tab completion
set_color normal
end