cleanup: Fix up whitespace everywhere.

[profile] / bashrc

diff --git a/bashrc b/bashrc
index 6fb97f4..4e941d1 100644 (file)
--- a/bashrc
+++ b/bashrc
@@ -1,3 +1,4 @@
+# -*-sh-*-
 #
 # $Id: .bashrc,v 1.6 1996/12/08 20:33:42 mdw Exp $
 #
@@ -20,7 +21,7 @@ if [ -t 0 ]; then
     PS2="> "
     PS4="+ "
   else
-    
+
     case "$TERM" in
       linux*|screen*|xterm*|vt100*)
        bold='\[\e[1m\]' unbold='\[\e[m\]' nl='\[\r\]' ;;
@@ -32,7 +33,7 @@ if [ -t 0 ]; then
       left="«" right="»"
     else
       case $USER in
-        mdw|mwooding)
+       mdw|mwooding)
          u="" left="[" right="]"
          ;;
        *)
@@ -42,7 +43,7 @@ if [ -t 0 ]; then
       if [ "$__mdw_tty" = "`tty`" ]; then
        left="<" right=">"
       else
-        export __mdw_tty="`tty`"
+       export __mdw_tty="`tty`"
       fi
     fi
 
@@ -85,7 +86,7 @@ shopt -u shift_verbose
 shopt -s sourcepath
 
 # --- Set the CDPATH ---
-# 
+#
 # CDPATH=~/src:/usr/src:/usr/lib:/usr/share
 # dots=..
 # i=6
@@ -129,6 +130,9 @@ alias e="$EDITOR"
 alias svn="svnwrap svn"
 alias @="ssh"
 
+[ -r /etc/bash_completion ] && . /etc/bash_completion
+[ -r $HOME/.bash_completion ] && . $HOME/.bash_completion
+
 # --- Make `xt' start an xterm, maybe logging into a remote host ---
 
 xt () {
@@ -174,6 +178,104 @@ core () {
   esac
 }
 
+# --- Turning on and off path hacks ---
+
+path-add () {
+  local pathvar export dir val
+  case $# in
+    1) pathvar=PATH dir=$1 export="export PATH";;
+    2) pathvar=$1 dir=$2 export=:;;
+    *) echo >&2 "Usage: $0 [VAR] DIR";;
+  esac
+  eval "val=\$$pathvar"
+  case ":$val:" in
+    *:"$dir":*) ;;
+    *) val=$dir:$val ;;
+  esac
+  eval "$pathvar=\$val"
+  $export
+}
+
+path-remove () {
+  local pathvar export dir val
+  case $# in
+    1) pathvar=PATH dir=$1 export="export PATH";;
+    2) pathvar=$1 dir=$2 export=:;;
+    *) echo >&2 "Usage: $0 [VAR] DIR";;
+  esac
+  eval "val=\$$pathvar"
+  case ":$val:" in
+    :"$dir":) val= ;;
+    :"$dir":*) val=${val#$dir:} ;;
+    *:"$dir":) val=${val%:$dir} ;;
+    *:"$dir":*) val=${val/:$dir:/:} ;;
+  esac
+  eval "$pathvar=\$val"
+  $export
+}
+
+pathhack () {
+  if [ $# -eq 0 ]; then
+    local IFS=:
+    for e in $PATH; do
+      case "$e" in
+       "$HOME/bin/hacks/"*)
+         echo ${e#$HOME/bin/hacks/}
+         ;;
+      esac
+    done
+    return
+  fi
+  local force=nil
+  local path=$PATH
+  while [ $# -gt 0 ]; do
+    arg=$1
+    case "$arg" in
+      -f | --force)
+       force=t
+       shift
+       continue
+       ;;
+      --)
+       shift
+       break
+       ;;
+      [-+]*)
+       ;;
+      *)
+       break
+       ;;
+    esac
+    hack=${arg#[+-]}
+    dir=$HOME/bin/hacks/$hack
+    [ -d "$dir" ] || {
+      echo "$0: path hack $hack not found"
+      return 1
+    }
+    case "$arg,$force,:$PATH:" in
+      -*,*,*:"$dir":*)
+       path-remove path "$dir"
+       ;;
+      +*,t,*:"$dir":*)
+       path-remove path "$dir"
+       path-add path "$dir"
+       ;;
+      +*,nil,*:"$dir":*)
+       ;;
+      +*,*)
+       path-add path "$dir"
+       ;;
+    esac
+    shift
+  done
+  if [ $# -eq 0 ]; then
+    PATH=$path
+    export PATH
+  else
+    PATH=$path "$@"
+  fi
+}
+
 # --- Fix `man' under Slowaris ---
 
 case "$MACHTYPE" in
@@ -199,4 +301,6 @@ if (( UID == 0 )); then
   set -o noclobber
 fi
 
+[ -f "$HOME/.bashrc-local" ] && . "$HOME/.bashrc-local"
+
 fi