From 16061d06a91b4ac7aa97819a3b0a2d9af5e413ab Mon Sep 17 00:00:00 2001 From: Ian Ray Date: Wed, 30 Sep 2015 23:59:46 +0300 Subject: [PATCH] prompt_pwd: zero fork prompt in general case Now only one fork (uname) occurs on first load. --- share/functions/prompt_pwd.fish | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/share/functions/prompt_pwd.fish b/share/functions/prompt_pwd.fish index e44b96490..59b6da91c 100644 --- a/share/functions/prompt_pwd.fish +++ b/share/functions/prompt_pwd.fish @@ -1,14 +1,15 @@ -set -l args_pre -set -l args_post +set -l s1 +set -l r1 switch (uname) case Darwin - set args_pre $args_pre -e 's|^/private/|/|' + set s1 '^/private/' + set r1 / case 'CYGWIN_*' - set args_pre $args_pre -e 's|^/cygdrive/\(.\)|\1/:|' - set args_post $args_post -e 's-^\([^/]\)/:/\?-\u\1:/-' + set s1 '^/cygdrive/(.)' + set r1 '$1:' end -function prompt_pwd -V args_pre -V args_post --description "Print the current working directory, shortened to fit the prompt" - set -l realhome ~ - echo $PWD | sed -e "s|^$realhome\$|~|" -e "s|^$realhome/|~/|" $args_pre -e 's-\([^/.]\)[^/]*/-\1/-g' $args_post +function prompt_pwd -V s1 -V r1 --description "Print the current working directory, shortened to fit the prompt" + set realhome ~ + string replace -r '^'"$realhome"'($|/)' '~$1' $PWD | string replace -r "$s1" "$r1" | string replace -ar '([^/.])[^/]*/' '$1/' end