commit 3fa04f5ed091cc25fe5cbd6bfb8306073790bfab
parent f2bf848f76263d528a1a4d75bf2904f148b90caa
Author: josuah <mail@josuah.net>
Date: Tue, 1 Nov 2016 16:38:44 -0400
Now have a prompt that works
Diffstat:
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/README b/README
@@ -59,4 +59,4 @@ ENVIRONMENT VARIABLES
--------------------------------------------------------------------------------
To work properly, Config needs a few environment variables. They
- are contained in SCRIPTS/config/environment.
+ are contained in "SCRIPTS/config/environment".
diff --git a/shell/.profile b/shell/.profile
@@ -68,7 +68,7 @@ git_status()
do
case "$status" in
#two fixed character matches, loop finished
- '##' ) branch_line="$line" ;;
+ '##' ) branch_line="$line"; break ;;
'??' ) untracked="$((untracked + 1))"; break ;;
U? ) conflicts="$((conflicts + 1))"; break ;;
?U ) conflicts="$((conflicts + 1))"; break ;;
@@ -98,11 +98,13 @@ EOF
if [ -z "${branch_line##*ahead *}" ]
then
ahead="${branch_line#*ahead }"
+ ahead="${ahead%, *}"
fi
if [ -z "${branch_line##*behind *}" ]
then
behind="${branch_line#*behind }"
+ behind="${behind%, *}"
fi
printf '\033[1m'