summaryrefslogtreecommitdiff
path: root/.bashrc
diff options
context:
space:
mode:
authorMike Crute <crutem@amazon.com>2019-01-14 14:17:27 -0800
committerMike Crute <crutem@amazon.com>2019-01-14 14:17:27 -0800
commit32d8d8a8464c5009252ba927f2f9caf6bffeb392 (patch)
tree9f5fe14b654e08e44c507d01c22b5b344f0b901f /.bashrc
parent4b924d4adb175bb4d5d7badbde61a9885f2279e3 (diff)
downloaddotfiles-32d8d8a8464c5009252ba927f2f9caf6bffeb392.tar.bz2
dotfiles-32d8d8a8464c5009252ba927f2f9caf6bffeb392.tar.xz
dotfiles-32d8d8a8464c5009252ba927f2f9caf6bffeb392.zip
Remove exit var tests
Diffstat (limited to '.bashrc')
-rw-r--r--.bashrc10
1 files changed, 3 insertions, 7 deletions
diff --git a/.bashrc b/.bashrc
index 03935ed..fab708a 100644
--- a/.bashrc
+++ b/.bashrc
@@ -6,8 +6,7 @@
6 6
7function clean_unalias 7function clean_unalias
8{ 8{
9 alias $1 &> /dev/null 9 if alias $1 &> /dev/null; then
10 if [[ $? == 0 ]]; then
11 unalias $1 10 unalias $1
12 fi 11 fi
13} 12}
@@ -179,9 +178,7 @@ have_command lesspipe.sh && eval "$(lesspipe.sh)"
179# these settings aren't that useful in that case anyhow so avoid setting them. 178# these settings aren't that useful in that case anyhow so avoid setting them.
180if [[ `uname` != "Darwin" && !( "$DISPLAY" =~ ^localhost:.* && -n "$SSH_TTY") ]]; then 179if [[ `uname` != "Darwin" && !( "$DISPLAY" =~ ^localhost:.* && -n "$SSH_TTY") ]]; then
181 # Only do this stuff if X is running 180 # Only do this stuff if X is running
182 xdpyinfo &>/dev/null 181 if xdpyinfo &>/dev/null; then
183
184 if [[ $? == 0 ]]; then
185 have_command xset && xset b 0 0 0 # NO BEEPING! 182 have_command xset && xset b 0 0 0 # NO BEEPING!
186 [[ -e ~/.Xdefaults ]] && xrdb -merge ~/.Xdefaults 183 [[ -e ~/.Xdefaults ]] && xrdb -merge ~/.Xdefaults
187 fi 184 fi
@@ -327,8 +324,7 @@ alias tmux-darken="tmux set-environment -g TERM_BG_SHADE dark"
327 324
328# ls Aliases 325# ls Aliases
329# Color flags a different between BSD ls and GNU ls 326# Color flags a different between BSD ls and GNU ls
330ls --color=auto &>/dev/null 327if ls --color=auto &>/dev/null; then
331if [[ $? == 0 ]]; then
332 eval "`dircolors -b`" 328 eval "`dircolors -b`"
333 alias ls='ls --color=auto' 329 alias ls='ls --color=auto'
334else 330else