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

s/sed/string replace builtin/g

Browse Source
This commit is contained in:
Justin Hileman 2017-01-29 20:02:01 -08:00
parent 73b3bd0ea3
commit 908a7b5365
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fish_prompt.fish
View File

@ -53,7 +53,7 @@
function __bobthefish_git_branch -S -d 'Get the current git branch (or commitish)'
set -l ref (command git symbolic-ref HEAD ^/dev/null)
and echo $ref | sed "s#refs/heads/#$__bobthefish_branch_glyph #"
and string replace 'refs/heads/' "$__bobthefish_branch_glyph " $ref
and return
set -l tag (command git describe --tags --exact-match ^/dev/null)
@ -492,14 +492,15 @@ function __bobthefish_prompt_git -S -a current_dir -d 'Display the actual git st
return
end
set -l project_pwd (command git rev-parse --show-prefix ^/dev/null | sed -e 's#/$##')
set -l project_pwd (command git rev-parse --show-prefix ^/dev/null | string replace -r '/$' '')
set -l work_dir (command git rev-parse --show-toplevel ^/dev/null)
# only show work dir if it's a parent…
if [ "$work_dir" ]
switch $PWD/
case $work_dir/\*
set work_dir (echo $work_dir | sed -e "s#^$current_dir##")
string match "$current_dir*" $work_dir
and set work_dir (string sub -s (string length $current_dir) $work_dir)
case \*
set -e work_dir
end
@ -515,7 +516,7 @@ function __bobthefish_prompt_git -S -a current_dir -d 'Display the actual git st
# handle work_dir != project dir
if [ "$work_dir" ]
set -l work_parent (dirname $work_dir | sed -e 's#^/##')
set -l work_parent (dirname $work_dir | string replace -r '^/' '')
if [ "$work_parent" ]
echo -n "$work_parent/"
end
@ -528,7 +529,11 @@ function __bobthefish_prompt_git -S -a current_dir -d 'Display the actual git st
echo -ns $project_pwd ' '
else
set project_pwd (echo $PWD | sed -e "s#^$current_dir##" -e 's#^/##')
set project_pwd $PWD
string match "$current_dir*" $project_pwd
and set project_pwd (string sub -s (string length $current_dir) $current_dir)
set project_pwd (string replace -r '^/' '' $project_pwd)
if [ "$project_pwd" ]
set -l colors $color_path
if not [ -w "$PWD" ]

6
fish_right_prompt.fish
View File

@ -8,15 +8,15 @@ function __bobthefish_cmd_duration -S -d 'Show command duration'
if [ "$CMD_DURATION" -lt 5000 ]
echo -ns $CMD_DURATION 'ms'
else if [ "$CMD_DURATION" -lt 60000 ]
math "scale=1;$CMD_DURATION/1000" | sed 's/\\.0$//'
math "scale=1;$CMD_DURATION/1000" | string replace -r '\\.0$' ''
echo -n 's'
else if [ "$CMD_DURATION" -lt 3600000 ]
set_color $fish_color_error
math "scale=1;$CMD_DURATION/60000" | sed 's/\\.0$//'
math "scale=1;$CMD_DURATION/60000" | string replace -r '\\.0$' ''
echo -n 'm'
else
set_color $fish_color_error
math "scale=2;$CMD_DURATION/3600000" | sed 's/\\.0$//'
math "scale=2;$CMD_DURATION/3600000" | string replace -r '\\.0$' ''
echo -n 'h'
end