From 86471ac21f09273403708aa60dccd79944b37a52 Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Mon, 5 Oct 2015 19:20:09 +0200 Subject: [PATCH] Remove OSX/Cygwin special cases from prompt_pwd For cygwin, you can't `cd C:`, so a prompt of "C:/Something" is misleading. For OSX, we dereference symlinks elsewhere This also simplifies prompt_pwd quite a bit. --- share/functions/prompt_pwd.fish | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/share/functions/prompt_pwd.fish b/share/functions/prompt_pwd.fish index 59b6da91c..4c766599c 100644 --- a/share/functions/prompt_pwd.fish +++ b/share/functions/prompt_pwd.fish @@ -1,15 +1,4 @@ -set -l s1 -set -l r1 -switch (uname) -case Darwin - set s1 '^/private/' - set r1 / -case 'CYGWIN_*' - set s1 '^/cygdrive/(.)' - set r1 '$1:' -end - -function prompt_pwd -V s1 -V r1 --description "Print the current working directory, shortened to fit the prompt" +function prompt_pwd --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/' + string replace -r '^'"$realhome"'($|/)' '~$1' $PWD | string replace -ar '([^/.])[^/]*/' '$1/' end