From edd87edfb71dc53c844596ad4750aab22cbb384a Mon Sep 17 00:00:00 2001 From: Nathan Joseph Edward Lasseter Date: Sat, 7 May 2011 14:16:49 +0100 Subject: Author: Nathan Joseph Edward Lasseter --- functions/fish_greeting.fish | 1 - functions/fish_prompt.fish | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/functions/fish_greeting.fish b/functions/fish_greeting.fish index ee30df4..018520b 100644 --- a/functions/fish_greeting.fish +++ b/functions/fish_greeting.fish @@ -1,3 +1,2 @@ function fish_greeting - set -g cmdcount 0 end diff --git a/functions/fish_prompt.fish b/functions/fish_prompt.fish index ad34183..9cc8ef7 100644 --- a/functions/fish_prompt.fish +++ b/functions/fish_prompt.fish @@ -1,9 +1,9 @@ function fish_prompt - set cmdcount (math $cmdcount+1) - printf '[%d] ' $cmdcount + printf '[%s@%s] ' (echo $USERNAME) (cat /etc/hostname) if test -d .git - printf '%s%s %s(%s)%s>: ' (set_color red) (pwd) (set_color blue) (git branch | grep "*" | awk -F" " '{print $2}') (set_color normal) + printf '%s%s %s(%s)' (set_color red) (pwd) (set_color blue) (git branch | grep "*" | awk -F" " '{print $2}') else - printf '%s%s%s>: ' (set_color red) (pwd) (set_color normal) + printf '%s%s' (set_color red) (pwd) end + printf '%s>: ' (set_color normal) end -- cgit v1.2.1