Archives/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish synced 2024-11-03 15:40:32 +00:00
Code Issues Projects Releases Wiki Activity

[bobthefish] DRY: we don't need two pwd-relative-to-project funcs

Browse Source
This commit is contained in:
Justin Hileman 2014-11-17 20:33:45 -08:00
parent eecb144e1e
commit c84ae81a12
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
themes/bobthefish/fish_prompt.fish
View File

@ -104,16 +104,9 @@ function __bobthefish_project_dir_hg -d 'Print the current git project base dire
end
function __bobthefish_project_pwd -d 'Print the working directory relative to project root'
set -l base_dir (__bobthefish_project_dir)
echo "$PWD" | sed -e "s*$base_dir**g" -e 's*^/**'
echo "$PWD" | sed -e "s*$argv[1]**g" -e 's*^/**'
end
function __bobthefish_project_pwd_hg -d 'Print the working directory relative to project root'
set -l base_dir (__bobthefish_project_dir_hg)
echo "$PWD" | sed -e "s*$base_dir**g" -e 's*^/**'
end
# ===========================
# Segment functions
@ -258,7 +251,7 @@ function __bobthefish_prompt_hg -d 'Display the actual hg state'
echo -n -s (__bobthefish_hg_branch) $flags ' '
set_color normal
set -l project_pwd (__bobthefish_project_pwd_hg)
set -l project_pwd (__bobthefish_project_pwd (__bobthefish_project_dir_hg))
if test "$project_pwd"
if test -w "$PWD"
__bobthefish_start_segment 333 999
@ -302,7 +295,7 @@ function __bobthefish_prompt_git -d 'Display the actual git state'
echo -n -s (__bobthefish_git_branch) $flags ' '
set_color normal
set -l project_pwd (__bobthefish_project_pwd)
set -l project_pwd (__bobthefish_project_pwd (__bobthefish_project_dir))
if test "$project_pwd"
if test -w "$PWD"
__bobthefish_start_segment 333 999