aboutsummaryrefslogtreecommitdiff
path: root/bash/bash_profile
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2016-08-21 21:09:15 +1200
committerTom Ryder <tom@sanctum.geek.nz>2016-08-21 21:25:15 +1200
commit7ddb8084297c5bf30db73e9b9058d71f52991901 (patch)
tree8b07077307ae6209d9e094270dbcc65b5e7e80c7 /bash/bash_profile
parentRestructure ed() to test,cache features on login (diff)
downloaddotfiles-7ddb8084297c5bf30db73e9b9058d71f52991901.tar.gz
dotfiles-7ddb8084297c5bf30db73e9b9058d71f52991901.zip
Many stylistic fixes/optimisations
In particular, limit the verbose >=2.05 test to just one file: .bashrc
Diffstat (limited to 'bash/bash_profile')
-rw-r--r--bash/bash_profile21
1 files changed, 4 insertions, 17 deletions
diff --git a/bash/bash_profile b/bash/bash_profile
index 69350102..69e812a0 100644
--- a/bash/bash_profile
+++ b/bash/bash_profile
@@ -1,19 +1,6 @@
# Load ~/.profile regardless of shell version
-if [ -e "$HOME"/.profile ] ; then
- . "$HOME"/.profile
-fi
+[ -e "$HOME"/.profile ] && . "$HOME"/.profile
-# Ensure we're using at least version 2.05. Weird arithmetic syntax needed here
-# due to leading zeroes and trailing letters in some 2.x version numbers (e.g.
-# 2.05a).
-if ! [ -n "$BASH_VERSINFO" ] ; then
- return
-elif ((BASH_VERSINFO[0] == 2)) &&
- ((10#${BASH_VERSINFO[1]%%[![:digit:]]*} < 5)) ; then
- return
-fi
-
-# If ~/.bashrc exists, source that too; the test for interactivity is in there
-if [[ -f $HOME/.bashrc ]] ; then
- source "$HOME"/.bashrc
-fi
+# If ~/.bashrc exists, source that too; the tests for both interactivity and
+# >=2.05a (for features like [[) are in there
+[ -f $HOME/.bashrc ] && . "$HOME"/.bashrc