mirror of
https://github.com/IlanCosman/tide.git
synced 2024-09-11 17:15:34 +03:00
Run fish from status fish-path
This commit is contained in:
parent
85d09604a0
commit
2b78ac2540
@ -9,7 +9,9 @@ function _tide_sub_bug-report
|
||||
set --long | string match -r "^_?tide.*" | # Get only tide variables
|
||||
string match -r --invert "^_tide_prompt_var.*" # Remove _tide_prompt_var
|
||||
else
|
||||
set -l fish_version (fish --version | string match -r "fish, version (\d\.\d\.\d)")[2]
|
||||
set -l fish_path (status fish-path)
|
||||
|
||||
set -l fish_version ($fish_path --version | string match -r "fish, version (\d\.\d\.\d)")[2]
|
||||
_tide_check_version Fish fish-shell/fish-shell "(\d\.\d\.\d)" $fish_version || return
|
||||
|
||||
set -l tide_version (tide --version | string match -r "tide, version (\d\.\d\.\d)")[2]
|
||||
|
@ -10,6 +10,7 @@ set -l prompt_var _tide_prompt_$fish_pid
|
||||
set -U $prompt_var # Set var here so if we erase $prompt_var, bg job won't set a uvar
|
||||
|
||||
set -l color_normal (set_color normal)
|
||||
set -l fish_path (status fish-path)
|
||||
|
||||
# _tide_repaint prevents us from creating a second background job
|
||||
function _tide_refresh_prompt --on-variable $prompt_var --on-variable COLUMNS
|
||||
@ -36,7 +37,7 @@ if contains newline $_tide_left_items # two line prompt initialization
|
||||
function fish_prompt
|
||||
_tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint
|
||||
jobs -q && set -lx _tide_jobs
|
||||
fish -c \"set _tide_pipestatus \$_tide_pipestatus
|
||||
$fish_path -c \"set _tide_pipestatus \$_tide_pipestatus
|
||||
CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_2_line_prompt)\" &
|
||||
builtin disown
|
||||
|
||||
@ -64,7 +65,7 @@ else # one line prompt initialization
|
||||
function fish_prompt
|
||||
_tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint
|
||||
jobs -q && set -lx _tide_jobs
|
||||
fish -c \"set _tide_pipestatus \$_tide_pipestatus
|
||||
$fish_path -c \"set _tide_pipestatus \$_tide_pipestatus
|
||||
CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_1_line_prompt)\" &
|
||||
builtin disown
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user