h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-30 11:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

fish_config: Remove right prompt in choose and save

Browse Source 
If the new theme no longer has any.

Fixes #8314.
This commit is contained in:
Fabian Homborg
2021-09-26 15:34:04 +02:00
parent ecaf455277
commit 69074c1591
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
share/functions/fish_config.fish
View File

@@ -82,34 +82,39 @@ function fish_config --description "Launch fish's web based configuration"
return 1 return 1
end end
set -l have 0 set -l have
for f in $prompt_dir/$argv[1].fish for f in $prompt_dir/$argv[1].fish
if test -f $f if test -f $f
source $f source $f
set have 1 set have $f
break break
end end
end end
if test $have -eq 0 if not set -q have[1]
echo "No such prompt: '$argv[1]'" >&2 echo "No such prompt: '$argv[1]'" >&2
return 1 return 1
end end
# Erase the right prompt if it didn't have any.
if functions -q fish_right_prompt; and test (functions --details fish_right_prompt) != $have[1]
functions --erase fish_right_prompt
end
case save case save
read -P"Overwrite prompt? [y/N]" -l yesno read -P"Overwrite prompt? [y/N]" -l yesno
if string match -riq 'y(es)?' -- $yesno if string match -riq 'y(es)?' -- $yesno
echo Overwriting echo Overwriting
cp $__fish_config_dir/functions/fish_prompt.fish{,.bak} cp $__fish_config_dir/functions/fish_prompt.fish{,.bak}
set -l have
if set -q argv[1] if set -q argv[1]
set -l have 0
for f in $prompt_dir/$argv[1].fish for f in $prompt_dir/$argv[1].fish
if test -f $f if test -f $f
set have 1 set have $f
source $f source $f
or return 2 or return 2
end end
end end
if test $have -eq 0 if not set -q have[1]
echo "No such prompt: '$argv[1]'" >&2 echo "No such prompt: '$argv[1]'" >&2
return 1 return 1
end end
@@ -118,8 +123,15 @@ function fish_config --description "Launch fish's web based configuration"
funcsave fish_prompt funcsave fish_prompt
or return or return
functions -q fish_right_prompt if functions -q fish_right_prompt; and test (functions --details fish_right_prompt) = $have[1]
and funcsave fish_right_prompt # We just read a right prompt, save it.
funcsave fish_right_prompt
else if test -e "$__fish_config_dir/functions/fish_right_prompt.fish"; and test (functions --details fish_right_prompt) != "$have[1]"
# We used to have a right prompt, overwrite it with an empty one.
function fish_right_prompt
end
funcsave fish_right_prompt
end
return return
else else