dotfiles: .bashrc annotate

annotate .bashrc @ 148:5b7d42a446c3

A few changes to layouts and such due to moving xanadu

author	Steve Huston <huston@astro.princeton.edu>
date	Thu, 02 Mar 2017 14:24:12 -0500
parents	472a38df3aed
children	282c9df47923

rev	line source
19 f65964738bab Added Id tag to files, and svn propset svn:keywords as appropriate huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 18 diff changeset	1 # $Id$
f65964738bab Added Id tag to files, and svn propset svn:keywords as appropriate huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 18 diff changeset	2 #
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	3 # This file is sourced for shells which are interactive but not a
7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	4 # login shell; however, since it is also sourced within
4 6ffd3fb73f7f s/\~\//\$HOME\//g - There's possibly a nicer way to make sure tilde expansion huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 3 diff changeset	5 # $HOME/.bash_profile, the end result is that this file is sourced for all
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	6 # shells.
0 c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	7
c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	8
c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	9 # Source global definitions
c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	10 if [ -f /etc/bashrc ]; then
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	11 . /etc/bashrc
0 c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	12 fi
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	13
7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	14 # User specific aliases and functions
0 c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	15 if [ -f $HOME/.bash_aliases ]; then
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	16 . $HOME/.bash_aliases
0 c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	17 fi
c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	18
3 072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	19 #
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	20 # Environment variables
3 072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	21 #
70 15f662bc38c8 Changed logic for prompt; using 'su' and keeping PS1 now changes color to huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 58 diff changeset	22 #[[ "$PS1" ]] && export PS1='${debian_chroot:+($debian_chroot)}\e[01;32m\h\e[00m:\e[01;34m\w\e[00m\$ '
15f662bc38c8 Changed logic for prompt; using 'su' and keeping PS1 now changes color to huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 58 diff changeset	23 [[ "$PS1" ]] && {
15f662bc38c8 Changed logic for prompt; using 'su' and keeping PS1 now changes color to huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 58 diff changeset	24 if [ -z "$DARWIN" ] ; then
87 a835f8c36e93 Fixed PS1 & vimdiff Steve Huston <huston@astro.princeton.edu> parents: 85 diff changeset	25 export PS1='${debian_chroot:+($debian_chroot)}\[\e[01;`case $EUID in 0) echo -n 31; ;; *) echo -n 32; ;; esac;`m\]\h\[\e[00m\]:\[\e[01;34m\]\w\[\e[00m\]\$ '
70 15f662bc38c8 Changed logic for prompt; using 'su' and keeping PS1 now changes color to huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 58 diff changeset	26 else
87 a835f8c36e93 Fixed PS1 & vimdiff Steve Huston <huston@astro.princeton.edu> parents: 85 diff changeset	27 export PS1='${debian_chroot:+($debian_chroot)}\[\e[01;`case $EUID in 0) echo "31\c"; ;; *) echo -n 32; ;; esac;`m\]\h\[\e[00m\]:\[\e[01;34m\]\w\[\e[00m\]\$ '
70 15f662bc38c8 Changed logic for prompt; using 'su' and keeping PS1 now changes color to huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 58 diff changeset	28 fi
15f662bc38c8 Changed logic for prompt; using 'su' and keeping PS1 now changes color to huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 58 diff changeset	29 }
3 072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	30 export PAGER=less
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	31 export EDITOR=vim
13 dacbbae5965c Added Ruby setup variables huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 9 diff changeset	32 export RUBYLIB=$HOME/Installs/rubygems/lib
dacbbae5965c Added Ruby setup variables huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 9 diff changeset	33 export GEM_HOME=$HOME/Installs/rubygems/gems
85 c75fecccc3e5 HG config changes: Steve Huston <huston@astro.princeton.edu> parents: 84 diff changeset	34 export HOST=`hostname -s`
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	35
148 5b7d42a446c3 A few changes to layouts and such due to moving xanadu Steve Huston <huston@astro.princeton.edu> parents: 146 diff changeset	36 if [ -f $HOME/.screen/$HOST ]; then
5b7d42a446c3 A few changes to layouts and such due to moving xanadu Steve Huston <huston@astro.princeton.edu> parents: 146 diff changeset	37 export SCREENRC=$HOME/.screen/$HOST
99 966c1e0b0a97 screenrc updates: Steve Huston <huston@astro.princeton.edu> parents: 87 diff changeset	38 fi
966c1e0b0a97 screenrc updates: Steve Huston <huston@astro.princeton.edu> parents: 87 diff changeset	39
16 b9896ae0733c Stole pretty PS1 and xterm title changing from BackTrack 4. Also added a huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 14 diff changeset	40 # If this is an xterm set the title to user@host:dir
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	41 case $TERM in
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	42 xterm\|rxvt)
142 90f60047d5b4 Set a bunch of history-friendly options Steve Huston <huston@astro.princeton.edu> parents: 141 diff changeset	43 PROMPT_COMMAND='history -a ; echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD/$HOME/~}\007"'
16 b9896ae0733c Stole pretty PS1 and xterm title changing from BackTrack 4. Also added a huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 14 diff changeset	44 ;;
141 ef534933ab04 Leave screen terminal titles alone Steve Huston <huston@srhuston.net> parents: 99 diff changeset	45 screen*)
ef534933ab04 Leave screen terminal titles alone Steve Huston <huston@srhuston.net> parents: 99 diff changeset	46 # But if it's a screen window, leave it alone please
142 90f60047d5b4 Set a bunch of history-friendly options Steve Huston <huston@astro.princeton.edu> parents: 141 diff changeset	47 PROMPT_COMMAND="history -a"
141 ef534933ab04 Leave screen terminal titles alone Steve Huston <huston@srhuston.net> parents: 99 diff changeset	48 ;;
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	49 *)
16 b9896ae0733c Stole pretty PS1 and xterm title changing from BackTrack 4. Also added a huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 14 diff changeset	50 ;;
b9896ae0733c Stole pretty PS1 and xterm title changing from BackTrack 4. Also added a huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 14 diff changeset	51 esac
b9896ae0733c Stole pretty PS1 and xterm title changing from BackTrack 4. Also added a huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 14 diff changeset	52
143 315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	53 # Set some friendly options for history
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	54 # Append to ~/.bash_history, don't overwrite it
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	55 shopt -s histappend
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	56 # Set the history a bit larger, both on disk and in memory
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	57 export HISTFILESIZE=10000
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	58 export HISTSIZE=10000
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	59 # Ignore lines starting with a space, and duplicates of the previous command;
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	60 # also, if a line is a dupe from earlier history, remove the previous line
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	61 # entirely
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	62 export HISTCONTROL='ignoreboth:erasedups'
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	63 # Ignore some commonly used and not noteworthy commands
146 472a38df3aed Add 'jobs' to ignore list Steve Huston <huston@astro.princeton.edu> parents: 145 diff changeset	64 export HISTIGNORE='bg:fg:jobs:history:ret:rbh:rj:rx:keys:ssh-add*:jobs'
143 315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	65 # Put a timestamp on history lines
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	66 export HISTTIMEFORMAT='%F %T '
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	67 # Fold multi-line commands into a single line
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	68 # This seems to be 'on' in many places already, but let's make sure
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	69 shopt -s cmdhist
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	70
3 072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	71 #
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	72 # Paths
3 072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	73 #
58 5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	74
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	75 # A test for modules, to be implemented in time:
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	76 # if [ "`type -t module`" == "function" ]; then
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	77 # module load foo
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	78 # fi
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	79
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	80 # Standard-ish paths; some of these may be in place already, but if
7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	81 # they're not they should probably go near the front of the pack.
3 072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	82 for P in /sbin /usr/sbin /usr/local/bin /usr/local/sbin \
32 29dfb30b069c Added /usr/X11R6/bin to $PATH (Macs store some stuff there, Linux has it huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 31 diff changeset	83 /opt/local/bin /opt/local/sbin /usr/X11R6/bin; do
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	84 if [ -d $P ]; then
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	85 [[ $PATH =~ (^\|:)$P($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	86 export PATH=${P}${PATH:+:$PATH}
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	87 fi
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	88 done
0 c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	89
3 072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	90 for M in /usr/local/share/man /usr/local/man /opt/local/share/man ; do
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	91 if [ -d $M ]; then
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	92 [[ $MANPATH =~ (^\|:)$M($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	93 export MANPATH=${M}${MANPATH:+:$MANPATH}
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	94 fi
3 072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	95 done
072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	96
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	97 # Local Perl install
4 6ffd3fb73f7f s/\~\//\$HOME\//g - There's possibly a nicer way to make sure tilde expansion huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 3 diff changeset	98 if [ -d $HOME/perl ]; then
49 8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	99 if [ -d $HOME/perl/lib/perl5 ]; then
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	100 [[ $PERL5LIB =~ (^\|:)$HOME/perl/lib/perl5($\|:) ]] \|\| \
49 8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	101 export PERL5LIB=$HOME/perl/lib/perl5${PERL5LIB:+:$PERL5LIB}
8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	102 fi
8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	103
8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	104 if [ -d $HOME/perl/lib64/perl5 ]; then
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	105 [[ $PERL5LIB =~ (^\|:)$HOME/perl/lib64/perl5($\|:) ]] \|\| \
49 8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	106 export PERL5LIB=$HOME/perl/lib64/perl5${PERL5LIB:+:$PERL5LIB}
8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	107 fi
8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	108
8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	109 if [ -d $HOME/perl/lib/perl5/site_perl ]; then
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	110 [[ $PERL5LIB =~ (^\|:)$HOME/perl/lib/perl5/site_perl($\|:) ]] \|\| \
49 8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	111 export PERL5LIB=$HOME/perl/lib/perl5/site_perl${PERL5LIB:+:$PERL5LIB}
8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	112 fi
8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	113
8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	114 if [ -d $HOME/perl/lib64/perl5/site_perl ]; then
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	115 [[ $PERL5LIB =~ (^\|:)$HOME/perl/lib64/perl5/site_perl($\|:) ]] \|\| \
49 8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	116 export PERL5LIB=$HOME/perl/lib64/perl5/site_perl${PERL5LIB:+:$PERL5LIB}
8d204a89b981 * Local Perl install paths weren't quite right - they assumed a link existed huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 33 diff changeset	117 fi
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	118
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	119 if [ -d $HOME/perl/share/man ]; then
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	120 [[ $MANPATH =~ (^\|:)$HOME/perl/share/man($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	121 export MANPATH=$HOME/perl/share/man:${MANPATH:+$MANPATH}
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	122 fi
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	123
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	124 if [ -d $HOME/perl/bin ]; then
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	125 [[ $PATH =~ (^\|:)$HOME/perl/bin($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	126 export PATH=$HOME/perl/bin${PATH:+:$PATH}
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	127 fi
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	128 fi
0 c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	129
4 6ffd3fb73f7f s/\~\//\$HOME\//g - There's possibly a nicer way to make sure tilde expansion huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 3 diff changeset	130 # Local install paths - install things to $HOME/Installs directories, and
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	131 # they will automatically get the proper paths added. Most things
7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	132 # that use autoconf will do this with
4 6ffd3fb73f7f s/\~\//\$HOME\//g - There's possibly a nicer way to make sure tilde expansion huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 3 diff changeset	133 # './configure --prefix=$HOME/Installs'
6ffd3fb73f7f s/\~\//\$HOME\//g - There's possibly a nicer way to make sure tilde expansion huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 3 diff changeset	134 for D in $HOME/Installs/* ; do
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	135 if [ -d $D/bin ]; then
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	136 [[ $PATH =~ (^\|:)$D/bin($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	137 export PATH=$D/bin${PATH:+:$PATH}
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	138 fi
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	139
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	140 if [ -d $D/share/man ]; then
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	141 [[ $MANPATH =~ (^\|:)$D/share/man($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	142 export MANPATH=$D/share/man:${MANPATH:+$MANPATH}
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	143 fi
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	144
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	145 if [ -d $D/man ]; then
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	146 [[ $MANPATH =~ (^\|:)$D/man($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	147 export MANPATH=$D/man:${MANPATH:+$MANPATH}
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	148 fi
0 c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	149 done
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	150
58 5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	151 ## Add-ons for Intel compilers at work, and Condor
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	152 #INTEL_ARCH=''
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	153 #case `uname -p` in
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	154 # i[3456]86)
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	155 # INTEL_ARCH="ia32"
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	156 # ;;
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	157 #
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	158 # x86_64)
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	159 # INTEL_ARCH="intel64"
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	160 # ;;
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	161 #esac
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	162 #[[ "$INTEL_ARCH" ]] && {
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	163 # [[ $PATH =~ (^\|:)/usr/peyton/intel ]] \|\| {
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	164 # [[ -f /usr/peyton/intel/11.0/bin/iccvars.sh ]] && \
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	165 # . /usr/peyton/intel/11.0/bin/iccvars.sh $INTEL_ARCH
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	166 # [[ -f /usr/peyton/intel/11.0/bin/ifortvars.sh ]] && \
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	167 # . /usr/peyton/intel/11.0/bin/ifortvars.sh $INTEL_ARCH
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	168 # }
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	169 #}
31 a93f5d5278f3 Fixed for Intel compilers 11.0 huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 30 diff changeset	170
58 5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	171 #if [ -f /u/condor/condor-setup.sh ]; then
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	172 # [[ $PATH =~ (^\|:)/u/condor/hosts/`hostname -s`/sbin($\|:) ]] \|\| {
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	173 # export PATH=${PATH:+$PATH:}/u/condor/hosts/`hostname -s`/sbin
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	174 # . /u/condor/condor-setup.sh
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	175 # }
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	176 #fi
5 3d0de329a850 Merged in new lines for network environment at work huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 4 diff changeset	177
4 6ffd3fb73f7f s/\~\//\$HOME\//g - There's possibly a nicer way to make sure tilde expansion huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 3 diff changeset	178 # Now make sure $HOME/bin is top of the list (or at least present)
6ffd3fb73f7f s/\~\//\$HOME\//g - There's possibly a nicer way to make sure tilde expansion huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 3 diff changeset	179 if [ -d $HOME/bin ]; then
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	180 [[ $PATH =~ (^\|:)$HOME/bin($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	181 export PATH=$HOME/bin${PATH:+:$PATH}
1 7e33b3191cf7 Merged in settings from home, and at the same time edited some of the huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 0 diff changeset	182 fi
4 6ffd3fb73f7f s/\~\//\$HOME\//g - There's possibly a nicer way to make sure tilde expansion huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 3 diff changeset	183
6ffd3fb73f7f s/\~\//\$HOME\//g - There's possibly a nicer way to make sure tilde expansion huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 3 diff changeset	184 # Last, make sure to end MANPATH with a ':' to force include of system paths
6ffd3fb73f7f s/\~\//\$HOME\//g - There's possibly a nicer way to make sure tilde expansion huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 3 diff changeset	185 # (some versions of man take care of this, but it doesn't hurt to have it
6ffd3fb73f7f s/\~\//\$HOME\//g - There's possibly a nicer way to make sure tilde expansion huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 3 diff changeset	186 # anyway)
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	187 [[ $MANPATH =~ :$ ]] \|\| export MANPATH=$MANPATH:
18 ebc3f864376c Removed the LD_LIBRARY_PATH lines entirely since I've not seen any ill effects huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 17 diff changeset	188
ebc3f864376c Removed the LD_LIBRARY_PATH lines entirely since I've not seen any ill effects huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 17 diff changeset	189 # Store MIBs in ~/mibs and they'll be added here. Can nest directories
ebc3f864376c Removed the LD_LIBRARY_PATH lines entirely since I've not seen any ill effects huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 17 diff changeset	190 # (they'll be searched).
ebc3f864376c Removed the LD_LIBRARY_PATH lines entirely since I've not seen any ill effects huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 17 diff changeset	191 if [ -d $HOME/mibs ]; then
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	192 for D in `find $HOME/mibs -type d` ; do
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	193 [[ $MIBDIRS =~ (^\+\|:)$D($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	194 export MIBDIRS=${MIBDIRS:+$MIBDIRS:}$D
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	195 done
18 ebc3f864376c Removed the LD_LIBRARY_PATH lines entirely since I've not seen any ill effects huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 17 diff changeset	196
51 44c36681ca0f * Removed many double quotes from tests; they caused the tests to pass on huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 49 diff changeset	197 [[ $MIBDIRS =~ ^\+ ]] \|\| export MIBDIRS=+$MIBDIRS
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	198 export MIBS=ALL
18 ebc3f864376c Removed the LD_LIBRARY_PATH lines entirely since I've not seen any ill effects huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 17 diff changeset	199 fi
33 f59f847377d7 * Added toodledo interfacing huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 32 diff changeset	200
f59f847377d7 * Added toodledo interfacing huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 32 diff changeset	201 # Display todo list
f59f847377d7 * Added toodledo interfacing huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 32 diff changeset	202 [[ "$PS1" && -f $HOME/.todo ]] && cat $HOME/.todo
f59f847377d7 * Added toodledo interfacing huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 32 diff changeset	203
f59f847377d7 * Added toodledo interfacing huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 32 diff changeset	204 [[ "$PS1" && -f $HOME/.todo && `eval $TDSTAT` -lt `eval $HDATE` ]] && {
f59f847377d7 * Added toodledo interfacing huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 32 diff changeset	205 update_toodledo &
f59f847377d7 * Added toodledo interfacing huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 32 diff changeset	206 disown %+
f59f847377d7 * Added toodledo interfacing huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 32 diff changeset	207 }

Mercurial > index.cgi > dotfiles

annotate .bashrc @ 148:5b7d42a446c3