dotfiles: .bashrc annotate

annotate .bashrc @ 226:0983785ab023

Discordbot plz

author	Steve Huston <huston@srhuston.net>
date	Sat, 21 Aug 2021 21:07:12 -0400
parents	335b0fba60a8
children	7833786173da

rev	line source
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	1 # 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	2 # 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	3 # $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	4 # shells.
0 c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	5
214 effc1e0edb49 Stop telling me about zsh plz kthx Steve Huston <huston@srhuston.net> parents: 212 diff changeset	6 # macOS 10.15 (Catalina) and further changed the default shell to zsh. While
effc1e0edb49 Stop telling me about zsh plz kthx Steve Huston <huston@srhuston.net> parents: 212 diff changeset	7 # it may be a simple transition, I've seen too many problems with zsh to want
effc1e0edb49 Stop telling me about zsh plz kthx Steve Huston <huston@srhuston.net> parents: 212 diff changeset	8 # to change yet. So this will tell the machine to not bother me about it when
effc1e0edb49 Stop telling me about zsh plz kthx Steve Huston <huston@srhuston.net> parents: 212 diff changeset	9 # opening new terminal windows. It really should be in ~/.bash_profile but
effc1e0edb49 Stop telling me about zsh plz kthx Steve Huston <huston@srhuston.net> parents: 212 diff changeset	10 # then existing screen sessions won't get the message, and it doesn't hurt to
effc1e0edb49 Stop telling me about zsh plz kthx Steve Huston <huston@srhuston.net> parents: 212 diff changeset	11 # be here anyway.
effc1e0edb49 Stop telling me about zsh plz kthx Steve Huston <huston@srhuston.net> parents: 212 diff changeset	12
effc1e0edb49 Stop telling me about zsh plz kthx Steve Huston <huston@srhuston.net> parents: 212 diff changeset	13 export BASH_SILENCE_DEPRECATION_WARNING=1
0 c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	14
c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	15 # Source global definitions
c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	16 if [ -f /etc/bashrc ]; then
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	17 . /etc/bashrc
0 c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	18 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	19
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 # User specific aliases and functions
0 c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	21 if [ -f $HOME/.bash_aliases ]; then
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	22 . $HOME/.bash_aliases
0 c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	23 fi
c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	24
3 072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	25 #
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	26 # 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	27 #
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 #[[ "$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	29 [[ "$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	30 if [ -z "$DARWIN" ] ; then
87 a835f8c36e93 Fixed PS1 & vimdiff Steve Huston <huston@astro.princeton.edu> parents: 85 diff changeset	31 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	32 else
87 a835f8c36e93 Fixed PS1 & vimdiff Steve Huston <huston@astro.princeton.edu> parents: 85 diff changeset	33 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	34 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	35 }
3 072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	36 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	37 export EDITOR=vim
13 dacbbae5965c Added Ruby setup variables huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 9 diff changeset	38 export RUBYLIB=$HOME/Installs/rubygems/lib
dacbbae5965c Added Ruby setup variables huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 9 diff changeset	39 export GEM_HOME=$HOME/Installs/rubygems/gems
168 282c9df47923 Long live TomeNET (and the mud) Steve Huston <huston@srhuston.net> parents: 148 diff changeset	40 export TOMENET_PATH=$HOME/Installs/tomenet/lib/
85 c75fecccc3e5 HG config changes: Steve Huston <huston@astro.princeton.edu> parents: 84 diff changeset	41 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	42
148 5b7d42a446c3 A few changes to layouts and such due to moving xanadu Steve Huston <huston@astro.princeton.edu> parents: 146 diff changeset	43 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	44 export SCREENRC=$HOME/.screen/$HOST
99 966c1e0b0a97 screenrc updates: Steve Huston <huston@astro.princeton.edu> parents: 87 diff changeset	45 fi
966c1e0b0a97 screenrc updates: Steve Huston <huston@astro.princeton.edu> parents: 87 diff changeset	46
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	47 # 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	48 case $TERM in
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	49 xterm\|rxvt)
142 90f60047d5b4 Set a bunch of history-friendly options Steve Huston <huston@astro.princeton.edu> parents: 141 diff changeset	50 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	51 ;;
188 a05016e4881b Stop screwing with term settings Steve Huston <huston@astro.princeton.edu> parents: 168 diff changeset	52 screen.xterm-256color)
a05016e4881b Stop screwing with term settings Steve Huston <huston@astro.princeton.edu> parents: 168 diff changeset	53 # Specifically, to hell with this one
a05016e4881b Stop screwing with term settings Steve Huston <huston@astro.princeton.edu> parents: 168 diff changeset	54 export TERM=screen
189 b2dc752234ae At least Milton's 'bash' doesn't grok ;& syntax Steve Huston <huston@srhuston.net> parents: 188 diff changeset	55 # Copied from below because the Mac's bash doesn't grok ;& as a
b2dc752234ae At least Milton's 'bash' doesn't grok ;& syntax Steve Huston <huston@srhuston.net> parents: 188 diff changeset	56 # passthrough
b2dc752234ae At least Milton's 'bash' doesn't grok ;& syntax Steve Huston <huston@srhuston.net> parents: 188 diff changeset	57 PROMPT_COMMAND="history -a"
b2dc752234ae At least Milton's 'bash' doesn't grok ;& syntax Steve Huston <huston@srhuston.net> parents: 188 diff changeset	58 ;;
141 ef534933ab04 Leave screen terminal titles alone Steve Huston <huston@srhuston.net> parents: 99 diff changeset	59 screen*)
ef534933ab04 Leave screen terminal titles alone Steve Huston <huston@srhuston.net> parents: 99 diff changeset	60 # 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	61 PROMPT_COMMAND="history -a"
141 ef534933ab04 Leave screen terminal titles alone Steve Huston <huston@srhuston.net> parents: 99 diff changeset	62 ;;
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	63 *)
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	64 ;;
b9896ae0733c Stole pretty PS1 and xterm title changing from BackTrack 4. Also added a huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 14 diff changeset	65 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	66
143 315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	67 # 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	68 # 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	69 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	70 # 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	71 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	72 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	73 # 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	74 # 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	75 # entirely
315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	76 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	77 # Ignore some commonly used and not noteworthy commands
217 335b0fba60a8 Forgot to glob the ignore for proxy Steve Huston <huston@srhuston.net> parents: 214 diff changeset	78 export HISTIGNORE='bg:fg:jobs:history:ret:rbh:rj:rx:keys:ssh-add:jobs:proxy'
143 315bbb06066a Let's put these here, for non-login shells as well Steve Huston <huston@astro.princeton.edu> parents: 142 diff changeset	79 # 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	80 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	81 # 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	82 # 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	83 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	84
3 072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	85 #
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	86 # Paths
3 072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	87 #
58 5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	88
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	89 # 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	90 # 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	91 # module load foo
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	92 # fi
5ae5253cbcc1 * Started making updates for module usage, needs to be finished. huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 51 diff changeset	93
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	94 # 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	95 # 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	96 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	97 /opt/local/bin /opt/local/sbin /usr/X11R6/bin; do
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	98 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	99 [[ $PATH =~ (^\|:)$P($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	100 export PATH=${P}${PATH:+:$PATH}
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	101 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	102 done
0 c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	103
3 072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	104 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	105 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	106 [[ $MANPATH =~ (^\|:)$M($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	107 export MANPATH=${M}${MANPATH:+:$MANPATH}
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	108 fi
3 072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	109 done
072b183989e0 Merged in changes for the Mac, including the beginnings of platform huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 1 diff changeset	110
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	111 # 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	112 # 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	113 # 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	114 # './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	115 for D in $HOME/Installs/* ; do
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	116 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	117 [[ $PATH =~ (^\|:)$D/bin($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	118 export PATH=$D/bin${PATH:+:$PATH}
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	119 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	120
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	121 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	122 [[ $MANPATH =~ (^\|:)$D/share/man($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	123 export MANPATH=$D/share/man:${MANPATH:+$MANPATH}
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	124 fi
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	125
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	126 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	127 [[ $MANPATH =~ (^\|:)$D/man($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	128 export MANPATH=$D/man:${MANPATH:+$MANPATH}
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	129 fi
0 c78481cfb082 Initial checkin: huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: diff changeset	130 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	131
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	132 # 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	133 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	134 [[ $PATH =~ (^\|:)$HOME/bin($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	135 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	136 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	137
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	138 # 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	139 # (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	140 # 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	141 [[ $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	142
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	143 # 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	144 # (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	145 if [ -d $HOME/mibs ]; then
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	146 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	147 [[ $MIBDIRS =~ (^\+\|:)$D($\|:) ]] \|\| \
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	148 export MIBDIRS=${MIBDIRS:+$MIBDIRS:}$D
ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	149 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	150
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	151 [[ $MIBDIRS =~ ^\+ ]] \|\| export MIBDIRS=+$MIBDIRS
30 ca6c77fe843b * Whitespace (ugh) huston@80426f53-59d1-405d-934b-f07cd76f4a1a parents: 27 diff changeset	152 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	153 fi

Mercurial > index.cgi > dotfiles

annotate .bashrc @ 226:0983785ab023