Mercurial > index.cgi > dotfiles
annotate .bashrc @ 285:f62fb9579277
Changing irc alias a little due to how docker exits; update histignore
| author | Steve Huston <huston@srhuston.net> |
|---|---|
| date | Tue, 16 Jul 2024 22:22:44 -0400 |
| parents | df0b24d4fabd |
| children |
| 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 | 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 | 14 |
| 15 # Source global definitions | |
| 16 if [ -f /etc/bashrc ]; then | |
|
30
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
17 . /etc/bashrc |
| 0 | 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 |
|
265
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
20 # DOTHOME is where dotfiles (like this one) live that might be used here, or |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
21 # might be shared to other places from here, so rather than duplicate them we |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
22 # put them in a subdirectory that is safe to "export" but will need to know |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
23 # where they live. Then if imported somewhere else, that location may be |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
24 # different than here - like in a temporary directory - so we'll need to know |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
25 # what it is and refer to it as such. The equivalent script to this very one |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
26 # that would load those files will have to set this first. |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
27 |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
28 export DOTHOME="$HOME/.shared" |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
29 |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
30 # Source shared files |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
31 if [ -f ${DOTHOME}/shared_bashrc ]; then |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
32 . ${DOTHOME}/shared_bashrc |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
33 fi |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
34 |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
35 # Load local aliases |
| 0 | 36 if [ -f $HOME/.bash_aliases ]; then |
|
30
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
37 . $HOME/.bash_aliases |
| 0 | 38 fi |
| 39 | |
|
3
072b183989e0
Merged in changes for the Mac, including the beginnings of platform
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
1
diff
changeset
|
40 # |
|
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
|
41 # 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
|
42 # |
|
256
d868be3816bf
New prompt settings to test out, works well on the Mac so far.
Steve Huston <huston@srhuston.net>
parents:
249
diff
changeset
|
43 |
|
13
dacbbae5965c
Added Ruby setup variables
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
9
diff
changeset
|
44 export RUBYLIB=$HOME/Installs/rubygems/lib |
|
dacbbae5965c
Added Ruby setup variables
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
9
diff
changeset
|
45 export GEM_HOME=$HOME/Installs/rubygems/gems |
|
168
282c9df47923
Long live TomeNET (and the mud)
Steve Huston <huston@srhuston.net>
parents:
148
diff
changeset
|
46 export TOMENET_PATH=$HOME/Installs/tomenet/lib/ |
|
260
15543c169f36
A few changes thanks to loading node.js stuff, makes sense since I might use it elsewhere too.
Steve Huston <huston@srhuston.net>
parents:
256
diff
changeset
|
47 # Since I've started playing with some node.js things, this is included in its |
|
15543c169f36
A few changes thanks to loading node.js stuff, makes sense since I might use it elsewhere too.
Steve Huston <huston@srhuston.net>
parents:
256
diff
changeset
|
48 # setup. |
|
15543c169f36
A few changes thanks to loading node.js stuff, makes sense since I might use it elsewhere too.
Steve Huston <huston@srhuston.net>
parents:
256
diff
changeset
|
49 export NVM_DIR="$HOME/.config/nvm" |
|
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
|
50 |
|
148
5b7d42a446c3
A few changes to layouts and such due to moving xanadu
Steve Huston <huston@astro.princeton.edu>
parents:
146
diff
changeset
|
51 if [ -f $HOME/.screen/$HOST ]; then |
|
265
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
52 # If we have a local one for this host, use it; if not the default set in |
|
df0b24d4fabd
Think I'm ready to check this all in now; shared dotfiles that can be "sent"
Steve Huston <huston@srhuston.net>
parents:
260
diff
changeset
|
53 # the shared settings will be there |
|
148
5b7d42a446c3
A few changes to layouts and such due to moving xanadu
Steve Huston <huston@astro.princeton.edu>
parents:
146
diff
changeset
|
54 export SCREENRC=$HOME/.screen/$HOST |
| 99 | 55 fi |
| 56 | |
|
143
315bbb06066a
Let's put these here, for non-login shells as well
Steve Huston <huston@astro.princeton.edu>
parents:
142
diff
changeset
|
57 # 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
|
58 # 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
|
59 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
|
60 # 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
|
61 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
|
62 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
|
63 # 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
|
64 # 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
|
65 # entirely |
|
315bbb06066a
Let's put these here, for non-login shells as well
Steve Huston <huston@astro.princeton.edu>
parents:
142
diff
changeset
|
66 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
|
67 # Ignore some commonly used and not noteworthy commands |
|
285
f62fb9579277
Changing irc alias a little due to how docker exits; update histignore
Steve Huston <huston@srhuston.net>
parents:
265
diff
changeset
|
68 export HISTIGNORE='bg:fg:jobs:history:ret:irc: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
|
69 # 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
|
70 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
|
71 # 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
|
72 # 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
|
73 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
|
74 |
|
3
072b183989e0
Merged in changes for the Mac, including the beginnings of platform
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
1
diff
changeset
|
75 # |
|
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
|
76 # Paths |
|
3
072b183989e0
Merged in changes for the Mac, including the beginnings of platform
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
1
diff
changeset
|
77 # |
|
58
5ae5253cbcc1
* Started making updates for module usage, needs to be finished.
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
51
diff
changeset
|
78 |
|
5ae5253cbcc1
* Started making updates for module usage, needs to be finished.
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
51
diff
changeset
|
79 # 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
|
80 # 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
|
81 # module load foo |
|
5ae5253cbcc1
* Started making updates for module usage, needs to be finished.
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
51
diff
changeset
|
82 # fi |
|
5ae5253cbcc1
* Started making updates for module usage, needs to be finished.
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
51
diff
changeset
|
83 |
|
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
|
84 # 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
|
85 # 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
|
86 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
|
87 /opt/local/bin /opt/local/sbin /usr/X11R6/bin; do |
|
30
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
88 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
|
89 [[ $PATH =~ (^|:)$P($|:) ]] || \ |
|
30
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
90 export PATH=${P}${PATH:+:$PATH} |
|
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
91 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
|
92 done |
| 0 | 93 |
|
3
072b183989e0
Merged in changes for the Mac, including the beginnings of platform
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
1
diff
changeset
|
94 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
|
95 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
|
96 [[ $MANPATH =~ (^|:)$M($|:) ]] || \ |
|
30
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
97 export MANPATH=${M}${MANPATH:+:$MANPATH} |
|
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
98 fi |
|
3
072b183989e0
Merged in changes for the Mac, including the beginnings of platform
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
1
diff
changeset
|
99 done |
|
072b183989e0
Merged in changes for the Mac, including the beginnings of platform
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
1
diff
changeset
|
100 |
|
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
|
101 # 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
|
102 # 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
|
103 # 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
|
104 # './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
|
105 for D in $HOME/Installs/* ; do |
|
249
7833786173da
Fixing 256-color screens, removing some whitespace. Further screen changes may be needed...
Steve Huston <huston@srhuston.net>
parents:
217
diff
changeset
|
106 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
|
107 [[ $PATH =~ (^|:)$D/bin($|:) ]] || \ |
|
30
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
108 export PATH=$D/bin${PATH:+:$PATH} |
|
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
109 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
|
110 |
|
249
7833786173da
Fixing 256-color screens, removing some whitespace. Further screen changes may be needed...
Steve Huston <huston@srhuston.net>
parents:
217
diff
changeset
|
111 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
|
112 [[ $MANPATH =~ (^|:)$D/share/man($|:) ]] || \ |
|
30
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
113 export MANPATH=$D/share/man:${MANPATH:+$MANPATH} |
|
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
114 fi |
|
249
7833786173da
Fixing 256-color screens, removing some whitespace. Further screen changes may be needed...
Steve Huston <huston@srhuston.net>
parents:
217
diff
changeset
|
115 |
|
7833786173da
Fixing 256-color screens, removing some whitespace. Further screen changes may be needed...
Steve Huston <huston@srhuston.net>
parents:
217
diff
changeset
|
116 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
|
117 [[ $MANPATH =~ (^|:)$D/man($|:) ]] || \ |
|
30
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
118 export MANPATH=$D/man:${MANPATH:+$MANPATH} |
|
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
119 fi |
| 0 | 120 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
|
121 |
|
260
15543c169f36
A few changes thanks to loading node.js stuff, makes sense since I might use it elsewhere too.
Steve Huston <huston@srhuston.net>
parents:
256
diff
changeset
|
122 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm |
|
15543c169f36
A few changes thanks to loading node.js stuff, makes sense since I might use it elsewhere too.
Steve Huston <huston@srhuston.net>
parents:
256
diff
changeset
|
123 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion |
|
15543c169f36
A few changes thanks to loading node.js stuff, makes sense since I might use it elsewhere too.
Steve Huston <huston@srhuston.net>
parents:
256
diff
changeset
|
124 |
|
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
|
125 # 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
|
126 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
|
127 [[ $PATH =~ (^|:)$HOME/bin($|:) ]] || \ |
|
30
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
128 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
|
129 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
|
130 |
|
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 # 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
|
132 # (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
|
133 # 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
|
134 [[ $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
|
135 |
|
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 # 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
|
137 # (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
|
138 if [ -d $HOME/mibs ]; then |
|
30
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
139 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
|
140 [[ $MIBDIRS =~ (^\+|:)$D($|:) ]] || \ |
|
30
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
141 export MIBDIRS=${MIBDIRS:+$MIBDIRS:}$D |
|
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
142 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
|
143 |
|
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
|
144 [[ $MIBDIRS =~ ^\+ ]] || export MIBDIRS=+$MIBDIRS |
|
30
ca6c77fe843b
* Whitespace (ugh)
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
27
diff
changeset
|
145 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
|
146 fi |
|
260
15543c169f36
A few changes thanks to loading node.js stuff, makes sense since I might use it elsewhere too.
Steve Huston <huston@srhuston.net>
parents:
256
diff
changeset
|
147 |