Fixed syntax error

[clearscm.git] / rc / functions

diff --git a/rc/functions b/rc/functions
index 2edcd15..88a4ba0 100644 (file)
--- a/rc/functions
+++ b/rc/functions
@@ -23,9 +23,8 @@ function title_bar {
     ROOT=shift
     ROOT="${NORMAL}\($ROOT\)"
   fi
-
+  
   prefix="$@"
-
   # Change $HOME -> ~
   if [ "${PWD#$HOME*}" != "$PWD" ]; then
     current_dir="~${PWD#$HOME*}"
@@ -58,8 +57,11 @@ function title_bar {
         "$TERM" = "vt221" ]; then
     string=$(echo "${SYSNAME##*:}:$@")
     echo -n "${ESC}]2;$string\007"
-  elif [ "$TERM" = "cygwin" -o "$TERM" = "vt100" -o "$TERM" = "xterm" ]; then
-    PS1="\[\e]0;$prefix$current_dir\a$AQUA\]$ROOT\[$YELLOW\]$SYSNAME:\[$NORMAL\]"
+  elif [ "$TERM" = "cygwin" -o \
+         "$TERM" = "vt100"  -o \
+         "$TERM" = "xterm"  -o \
+         "$TERM" = "xterm-256color" ]; then
+    PS1="\[\e]0;$prefix$current_dir\007\]\[$RED\]$ROOT\[$LIGHT_CYAN\]$SYSNAME:\[$WHITE\]"
   fi
 } # title_bar
 
@@ -102,7 +104,7 @@ function set_title {
     view_name=""
     title_bar "$ROOT"
   else
-    title_bar "$ROOT" "View: $view_name: "
+    title_bar "${ROOT}View: $view_name: "
   fi
 
   icon_name "${SYSNAME##*:}"
@@ -117,17 +119,19 @@ function set_prompt {
          "$TERM"   = "dtterm" -o \
          ! -z "$DTTERM" ]; then
       ROOT="${RED}Wizard$NORMAL "
-    elif [ "$TERM" = "vt100" -o \
-           "$TERM" = "xterm" -o \
-          "$TERM" = "vt220" ]; then
+    elif [ "$TERM" = "vt100"          -o \
+           "$TERM" = "xterm"          -o \
+           "$TERM" = "xterm-256color" -o \
+           "$TERM" = "vt220" ]; then
       ROOT="${BOLD}${BLINK}Wizard$NORMAL "
     fi
   else
     ROOT=""
   fi
 
-  if [ "$TERM" = "vt100" -o \
-       "$TERM" = "xterm" -o \
+  if [ "$TERM" = "vt100"          -o \
+       "$TERM" = "xterm"          -o \
+       "$TERM" = "xterm-256color" -o \
        "$TERM" = "vt220" ]; then
     PS1="$ROOT$BOLD$SYSNAME:$NORMAL"
   else
@@ -194,6 +198,18 @@ function ssh {
   set_prompt
 } # ssh
 
+function processRunning {
+  if [ $ARCHITECTURE = "FreeBSD" ]; then
+    psopts="-aux"
+  else
+    psopts="-ef"
+  fi
+
+  if [ $1 != '' ]; then
+    return $(ps $psopts | grep "$1" | grep -v "grep $1" | grep -v "grep -d skip" | wc -l)
+  fi
+} # processRunning
+
 function sj {
   if [ $ARCHITECTURE = "FreeBSD" ]; then
     psopts="-aux"
@@ -247,17 +263,47 @@ function cmdline {
 } # cmdline
 
 function user {
+  processRunning ypbind;  ypbind=$?
+  processRunning winbind; winbind=$?
+
   if [ $# -gt 0 ]; then
-    ypcat passwd | grep -i $@
+    if [ $ypbind -gt 0 ]; then
+      ypcat passwd | grep -i $@
+    elif [ $winbind -gt 0 ]; then
+      for user in $(wbinfo -u | grep -i $@); do
+        wbinfo --user-info $user
+      done
+    fi
   else
-    ypcat passwd | $PAGER
+    if [ $ypbind -gt 0 ]; then
+      ypcat passwd | $PAGER
+    elif [ $wbind -gt 0 ]; then
+      for user in $(wbinfo -u); do
+        wbinfo --user-info $user
+      done | $PAGER
+    fi
   fi
 } # user
 
 function group {
+  processRunning ypbind;  ypbind=$?
+  processRunning winbind; winbind=$?
+
   if [ $# -gt 0 ]; then
-    ypcat group | grep -i $@
+    if [ $ypbind -gt 0 ]; then
+      ypcat group | grep -i $@
+    elif [ $winbind -gt 0 ]; then
+      for group in $(wbinfo -g | grep -i $@); do
+        wbinfo --group-info $group
+      done
+    fi
   else
-    ypcat group | $PAGER
+    if [ $ypbind -gt 0 ]; then
+      ypcat group | $PAGER
+    elif [ $winbind -gt 0 ]; then
+      for group in $(wbinfo -g); do
+        wbinfo --group-info $group
+      done | $PAGER
+    fi
   fi
 } # group