annotate .bashrc @ 206:3b8b613c4d7a

Whitespace!
author Steve Huston <huston@astro.princeton.edu>
date Tue, 24 Nov 2020 17:33:55 -0500
parents 6e7913283c7a
children a20525b2ef00
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
c78481cfb082 Initial checkin:
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
6
c78481cfb082 Initial checkin:
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
7 # Source global definitions
c78481cfb082 Initial checkin:
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
8 if [ -f /etc/bashrc ]; then
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
9 . /etc/bashrc
0
c78481cfb082 Initial checkin:
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
10 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
11
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
12 # User specific aliases and functions
0
c78481cfb082 Initial checkin:
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
13 if [ -f $HOME/.bash_aliases ]; then
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
14 . $HOME/.bash_aliases
0
c78481cfb082 Initial checkin:
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
15 fi
c78481cfb082 Initial checkin:
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
16
3
072b183989e0 Merged in changes for the Mac, including the beginnings of platform
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 1
diff changeset
17 #
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
18 # 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
19 #
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
20 #[[ "$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
21 [[ "$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
22 if [ -z "$DARWIN" ] ; then
87
a835f8c36e93 Fixed PS1 & vimdiff
Steve Huston <huston@astro.princeton.edu>
parents: 85
diff changeset
23 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
24 else
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 "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
26 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
27 }
3
072b183989e0 Merged in changes for the Mac, including the beginnings of platform
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 1
diff changeset
28 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
29 export EDITOR=vim
13
dacbbae5965c Added Ruby setup variables
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 9
diff changeset
30 export RUBYLIB=$HOME/Installs/rubygems/lib
dacbbae5965c Added Ruby setup variables
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 9
diff changeset
31 export GEM_HOME=$HOME/Installs/rubygems/gems
168
282c9df47923 Long live TomeNET (and the mud)
Steve Huston <huston@srhuston.net>
parents: 148
diff changeset
32 export TOMENET_PATH=$HOME/Installs/tomenet/lib/
85
c75fecccc3e5 HG config changes:
Steve Huston <huston@astro.princeton.edu>
parents: 84
diff changeset
33 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
34
148
5b7d42a446c3 A few changes to layouts and such due to moving xanadu
Steve Huston <huston@astro.princeton.edu>
parents: 146
diff changeset
35 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
36 export SCREENRC=$HOME/.screen/$HOST
99
966c1e0b0a97 screenrc updates:
Steve Huston <huston@astro.princeton.edu>
parents: 87
diff changeset
37 fi
966c1e0b0a97 screenrc updates:
Steve Huston <huston@astro.princeton.edu>
parents: 87
diff changeset
38
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
39 # 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
40 case $TERM in
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
41 xterm*|rxvt*)
142
90f60047d5b4 Set a bunch of history-friendly options
Steve Huston <huston@astro.princeton.edu>
parents: 141
diff changeset
42 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
43 ;;
188
a05016e4881b Stop screwing with term settings
Steve Huston <huston@astro.princeton.edu>
parents: 168
diff changeset
44 screen.xterm-256color)
a05016e4881b Stop screwing with term settings
Steve Huston <huston@astro.princeton.edu>
parents: 168
diff changeset
45 # Specifically, to hell with this one
a05016e4881b Stop screwing with term settings
Steve Huston <huston@astro.princeton.edu>
parents: 168
diff changeset
46 export TERM=screen
189
b2dc752234ae At least Milton's 'bash' doesn't grok ;& syntax
Steve Huston <huston@srhuston.net>
parents: 188
diff changeset
47 # 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
48 # passthrough
b2dc752234ae At least Milton's 'bash' doesn't grok ;& syntax
Steve Huston <huston@srhuston.net>
parents: 188
diff changeset
49 PROMPT_COMMAND="history -a"
b2dc752234ae At least Milton's 'bash' doesn't grok ;& syntax
Steve Huston <huston@srhuston.net>
parents: 188
diff changeset
50 ;;
141
ef534933ab04 Leave screen terminal titles alone
Steve Huston <huston@srhuston.net>
parents: 99
diff changeset
51 screen*)
ef534933ab04 Leave screen terminal titles alone
Steve Huston <huston@srhuston.net>
parents: 99
diff changeset
52 # 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
53 PROMPT_COMMAND="history -a"
141
ef534933ab04 Leave screen terminal titles alone
Steve Huston <huston@srhuston.net>
parents: 99
diff changeset
54 ;;
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
55 *)
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
56 ;;
b9896ae0733c Stole pretty PS1 and xterm title changing from BackTrack 4. Also added a
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 14
diff changeset
57 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
58
143
315bbb06066a Let's put these here, for non-login shells as well
Steve Huston <huston@astro.princeton.edu>
parents: 142
diff changeset
59 # 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
60 # 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
61 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
62 # 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
63 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
64 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
65 # 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
66 # 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
67 # entirely
315bbb06066a Let's put these here, for non-login shells as well
Steve Huston <huston@astro.princeton.edu>
parents: 142
diff changeset
68 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
69 # 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
70 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
71 # 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
72 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
73 # 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
74 # 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
75 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
76
3
072b183989e0 Merged in changes for the Mac, including the beginnings of platform
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 1
diff changeset
77 #
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
78 # Paths
3
072b183989e0 Merged in changes for the Mac, including the beginnings of platform
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 1
diff changeset
79 #
58
5ae5253cbcc1 * Started making updates for module usage, needs to be finished.
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 51
diff changeset
80
5ae5253cbcc1 * Started making updates for module usage, needs to be finished.
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 51
diff changeset
81 # 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
82 # 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
83 # module load foo
5ae5253cbcc1 * Started making updates for module usage, needs to be finished.
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 51
diff changeset
84 # fi
5ae5253cbcc1 * Started making updates for module usage, needs to be finished.
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 51
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 # 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
87 # 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
88 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
89 /opt/local/bin /opt/local/sbin /usr/X11R6/bin; do
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
90 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
91 [[ $PATH =~ (^|:)$P($|:) ]] || \
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
92 export PATH=${P}${PATH:+:$PATH}
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
93 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
94 done
0
c78481cfb082 Initial checkin:
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
95
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 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
97 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
98 [[ $MANPATH =~ (^|:)$M($|:) ]] || \
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
99 export MANPATH=${M}${MANPATH:+:$MANPATH}
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
100 fi
3
072b183989e0 Merged in changes for the Mac, including the beginnings of platform
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 1
diff changeset
101 done
072b183989e0 Merged in changes for the Mac, including the beginnings of platform
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 1
diff changeset
102
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
103 # 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
104 # 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
105 # 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
106 # './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
107 for D in $HOME/Installs/* ; do
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
108 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
109 [[ $PATH =~ (^|:)$D/bin($|:) ]] || \
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
110 export PATH=$D/bin${PATH:+:$PATH}
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
111 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
112
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
113 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
114 [[ $MANPATH =~ (^|:)$D/share/man($|:) ]] || \
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
115 export MANPATH=$D/share/man:${MANPATH:+$MANPATH}
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
116 fi
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
117
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
118 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
119 [[ $MANPATH =~ (^|:)$D/man($|:) ]] || \
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
120 export MANPATH=$D/man:${MANPATH:+$MANPATH}
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
121 fi
0
c78481cfb082 Initial checkin:
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
122 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
123
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
124 # 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
125 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
126 [[ $PATH =~ (^|:)$HOME/bin($|:) ]] || \
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
127 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
128 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
129
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 # 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
131 # (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
132 # 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
133 [[ $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
134
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
135 # 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
136 # (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
137 if [ -d $HOME/mibs ]; then
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
138 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
139 [[ $MIBDIRS =~ (^\+|:)$D($|:) ]] || \
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
140 export MIBDIRS=${MIBDIRS:+$MIBDIRS:}$D
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
141 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
142
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
143 [[ $MIBDIRS =~ ^\+ ]] || export MIBDIRS=+$MIBDIRS
30
ca6c77fe843b * Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents: 27
diff changeset
144 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
145 fi