diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2019-01-01 01:11:08 +1300 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-01-01 01:11:08 +1300 |
| commit | e19bb8fb3c8350bee288327abd978a59eb3dc0f7 (patch) | |
| tree | 754d2d883b27477f53f0fece44ef9edc7e4238f0 /sh/shrc | |
| parent | Merge branch 'release/v4.2.0' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-4.3.0.tar.gz (sig) dotfiles-4.3.0.zip | |
Merge branch 'release/v4.3.0'v4.3.0
* release/v4.3.0:
Bump VERSION
Switch to using GNU Emacs on development machines
Trim some trailing whitespace
Clarify control flow in shell scripts
Add clarifying comment
Translate a short-circuit into a conditional
Add a cheeky error message to sd()
Strip trailing slashes from sd() target
Correct error message from sd()
Diffstat (limited to 'sh/shrc')
| -rw-r--r-- | sh/shrc | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -8,13 +8,15 @@ command -p stty -ixon -ctlecho 2>/dev/null HISTSIZE=$((1 << 12)) # If HOSTNAME isn't set by this shell, we'll do it -[ -n "$HOSTNAME" ] || HOSTNAME=$(uname -n) +if [ -z "$HOSTNAME" ] ; then + HOSTNAME=$(uname -n) +fi # Don't warn me about new mail unset -v MAILCHECK # Load all the POSIX-compatible functions from ~/.shrc.d; more advanced shells -# like bash will have their own functions +# like bash will have their own functions in addition to these for sh in "$HOME"/.shrc.d/*.sh ; do [ -e "$sh" ] || continue . "$sh" |