Merge branch 'master' of /opt/git/clearscm

[clearscm.git] / rc / functions

diff --git a/rc/functions b/rc/functions
index fd373a2..69f8aa1 100644 (file)
--- a/rc/functions
+++ b/rc/functions
@@ -38,6 +38,11 @@ function title_bar {
     current_dir="$current_dir ($(cat CVS/Root | tr -d $CR))"
   fi
 
+  # Add GIT info if available
+  if in_git_repo; then
+    current_dir="$current_dir [git: $(git branch | sed -n -e 's/^\* \(.*\)/\1/p')]"
+  fi
+
   if [ "$TERM" = "hpterm" -o \
        "$TERM" = "hp"     -o \
        "$TERM" = "2392A" ]; then
@@ -184,7 +189,7 @@ function ssh {
 } # ssh
 
 function sj {
-  if [ $ARCH = "FreeBSD" ]; then
+  if [ $ARCHITECTURE = "FreeBSD" ]; then
     psopts="-aux"
   else
     psopts="-ef"