diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2018-11-30 14:17:01 +1300 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-11-30 14:17:01 +1300 |
| commit | f02abc131991a754a9aabed14c6acdbed253a1de (patch) | |
| tree | 800027c8a3460f911a68db65bf330a2fbcf471e7 /bash/bash_profile | |
| parent | Merge branch 'hotfix/v2.1.1' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-f02abc131991a754a9aabed14c6acdbed253a1de.tar.gz dotfiles-f02abc131991a754a9aabed14c6acdbed253a1de.zip | |
Merge branch 'release/v2.2.0'v2.2.0
* release/v2.2.0:
Bump VERSION
Add `abort` attribute to new autoload function
Suppress a couple of ShellCheck errors
Remove redundant return short-circuit
Add explanatory comments for version check
Use ||/&& short-circuiting only for flow control
Drop support for Bash <= 3.0
Diffstat (limited to 'bash/bash_profile')
| -rw-r--r-- | bash/bash_profile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bash/bash_profile b/bash/bash_profile index 0376ee57..1f5a633a 100644 --- a/bash/bash_profile +++ b/bash/bash_profile @@ -1,5 +1,7 @@ # Load ~/.profile regardless of shell version -[ -e "$HOME"/.profile ] && . "$HOME"/.profile +if [ -e "$HOME"/.profile ] ; then + . "$HOME"/.profile +fi # If POSIXLY_CORRECT is set after doing that, force the `posix` option on and # don't load the rest of this stuff--so, just ~/.profile and ENV @@ -9,5 +11,7 @@ if [ -n "$POSIXLY_CORRECT" ] ; then 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 +# minimum version numbers are in there +if [ -f "$HOME"/.bashrc ] ; then + . "$HOME"/.bashrc +fi |