--- a/.bashrc	Fri Jan 22 18:38:23 2010 +0000
+++ b/.bashrc	Mon Feb 01 19:33:19 2010 +0000
@@ -8,12 +8,12 @@
 
 # Source global definitions
 if [ -f /etc/bashrc ]; then
-   . /etc/bashrc
+  . /etc/bashrc
 fi
 
 # User specific aliases and functions
 if [ -f $HOME/.bash_aliases ]; then
-   . $HOME/.bash_aliases
+  . $HOME/.bash_aliases
 fi
 
 #
@@ -27,10 +27,10 @@
 
 # If this is an xterm set the title to user@host:dir
 case "$TERM" in
-xterm*|rxvt*)
+  xterm*|rxvt*)
     PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD/$HOME/~}\007"'
     ;;
-*)
+  *)
     ;;
 esac
 
@@ -40,30 +40,34 @@
 # Standard-ish paths; some of these may be in place already, but if
 # they're not they should probably go near the front of the pack.
 for P in /sbin /usr/sbin /usr/local/bin /usr/local/sbin \
-    /opt/local/bin /opt/local/sbin ; do
-   [[ "$PATH" =~ "(^|:)$P($|:)" ]] || \
-   export PATH=${P}${PATH:+:$PATH}
+  /opt/local/bin /opt/local/sbin ; do
+  if [ -d $P ]; then
+    [[ "$PATH" =~ "(^|:)$P($|:)" ]] || \
+    export PATH=${P}${PATH:+:$PATH}
+  fi
 done
 
 for M in /usr/local/share/man /usr/local/man /opt/local/share/man ; do
-   [[ "$MANPATH" =~ "(^|:)$M($|:)" ]] || \
-   export MANPATH=${M}${MANPATH:+:$MANPATH}
+  if [ -d $M ]; then
+    [[ "$MANPATH" =~ "(^|:)$M($|:)" ]] || \
+    export MANPATH=${M}${MANPATH:+:$MANPATH}
+  fi
 done
 
 # Local Perl install
 if [ -d $HOME/perl ]; then
-   [[ "$PERL5LIB" =~ "(^|:)$HOME/perl($|:)" ]] || \
-   export PERL5LIB=$HOME/perl${PERL5LIB:+:$PERL5LIB}
+  [[ "$PERL5LIB" =~ "(^|:)$HOME/perl($|:)" ]] || \
+  export PERL5LIB=$HOME/perl${PERL5LIB:+:$PERL5LIB}
 
-   if [ -d $HOME/perl/share/man ]; then
-      [[ "$MANPATH" =~ "(^|:)$HOME/perl/share/man($|:)" ]] || \
-      export MANPATH=$HOME/perl/share/man:${MANPATH:+$MANPATH}
-   fi
+  if [ -d $HOME/perl/share/man ]; then
+    [[ "$MANPATH" =~ "(^|:)$HOME/perl/share/man($|:)" ]] || \
+    export MANPATH=$HOME/perl/share/man:${MANPATH:+$MANPATH}
+  fi
 
-   if [ -d $HOME/perl/bin ]; then
-      [[ "$PATH" =~ "(^|:)$HOME/perl/bin($|:)" ]] || \
-      export PATH=$HOME/perl/bin${PATH:+:$PATH}
-   fi
+  if [ -d $HOME/perl/bin ]; then
+    [[ "$PATH" =~ "(^|:)$HOME/perl/bin($|:)" ]] || \
+    export PATH=$HOME/perl/bin${PATH:+:$PATH}
+  fi
 fi
 
 # Local install paths - install things to $HOME/Installs directories, and
@@ -71,36 +75,36 @@
 # that use autoconf will do this with
 # './configure --prefix=$HOME/Installs'
 for D in $HOME/Installs/* ; do
-   if [ -d $D/bin ]; then 
-      [[ "$PATH" =~ "(^|:)$D/bin($|:)" ]] || \
-      export PATH=$D/bin${PATH:+:$PATH}
-   fi
+  if [ -d $D/bin ]; then 
+    [[ "$PATH" =~ "(^|:)$D/bin($|:)" ]] || \
+    export PATH=$D/bin${PATH:+:$PATH}
+  fi
 
-   if [ -d $D/share/man ]; then 
-      [[ "$MANPATH" =~ "(^|:)$D/share/man($|:)" ]] || \
-      export MANPATH=$D/share/man:${MANPATH:+$MANPATH}
-   fi
-   
-   if [ -d $D/man ]; then 
-      [[ "$MANPATH" =~ "(^|:)$D/man($|:)" ]] || \
-      export MANPATH=$D/man:${MANPATH:+$MANPATH}
-   fi
+  if [ -d $D/share/man ]; then 
+    [[ "$MANPATH" =~ "(^|:)$D/share/man($|:)" ]] || \
+    export MANPATH=$D/share/man:${MANPATH:+$MANPATH}
+  fi
+  
+  if [ -d $D/man ]; then 
+    [[ "$MANPATH" =~ "(^|:)$D/man($|:)" ]] || \
+    export MANPATH=$D/man:${MANPATH:+$MANPATH}
+  fi
 done
 
 # Add-ons for Intel compilers at work, and Condor
-[[ -f /usr/peyton/intel/10.1/cc64/bin/iccvars.sh ]] && \
-   . /usr/peyton/intel/10.1/cc64/bin/iccvars.sh
-[[ -f /usr/peyton/intel/10.1/fc64/bin/ifortvars.sh ]] && \
-   . /usr/peyton/intel/10.1/fc64/bin/ifortvars.sh
+[[ -f /usr/peyton/intel/11.0/bin/iccvars.sh ]] && \
+  . /usr/peyton/intel/11.0/bin/iccvars.sh
+[[ -f /usr/peyton/intel/11.0/bin/ifortvars.sh ]] && \
+  . /usr/peyton/intel/11.0/bin/ifortvars.sh
 [[ -f /u/condor/condor-setup.sh ]] && {
-   export PATH=${PATH:+$PATH:}/u/condor/hosts/`hostname -s`/sbin
-   . /u/condor/condor-setup.sh
+  export PATH=${PATH:+$PATH:}/u/condor/hosts/`hostname -s`/sbin
+  . /u/condor/condor-setup.sh
 }
 
 # Now make sure $HOME/bin is top of the list (or at least present)
 if [ -d $HOME/bin ]; then
-   [[ "$PATH" =~ "(^|:)$HOME/bin($|:)" ]] || \
-   export PATH=$HOME/bin${PATH:+:$PATH}
+  [[ "$PATH" =~ "(^|:)$HOME/bin($|:)" ]] || \
+  export PATH=$HOME/bin${PATH:+:$PATH}
 fi
 
 # Last, make sure to end MANPATH with a ':' to force include of system paths
@@ -111,11 +115,11 @@
 # Store MIBs in ~/mibs and they'll be added here.  Can nest directories
 # (they'll be searched).
 if [ -d $HOME/mibs ]; then
-   for D in `find $HOME/mibs -type d` ; do
-      [[ "$MIBDIRS" =~ "(^\+|:)$D($|:)" ]] || \
-      export MIBDIRS=${MIBDIRS:+$MIBDIRS:}$D
-   done
+  for D in `find $HOME/mibs -type d` ; do
+    [[ "$MIBDIRS" =~ "(^\+|:)$D($|:)" ]] || \
+    export MIBDIRS=${MIBDIRS:+$MIBDIRS:}$D
+  done
 
-   [[ "$MIBDIRS" =~ "^\+" ]] || export MIBDIRS=+$MIBDIRS
-   export MIBS=ALL
+  [[ "$MIBDIRS" =~ "^\+" ]] || export MIBDIRS=+$MIBDIRS
+  export MIBS=ALL
 fi