diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2014-02-10 10:54:53 +1300 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2014-02-10 10:54:53 +1300 |
| commit | 95012843e6dc9197bbcecf77eb655cbed370b88d (patch) | |
| tree | 64a8b96d2b910a93fc0ff807208cb61a573bf6d3 | |
| parent | Always use -H switch for sudo(8) (diff) | |
| download | dotfiles-95012843e6dc9197bbcecf77eb655cbed370b88d.tar.gz dotfiles-95012843e6dc9197bbcecf77eb655cbed370b88d.zip | |
Use -r test consistently rather than -f
Implicitly check whether file exists and is legible
| -rw-r--r-- | bash/bashrc | 2 | ||||
| -rw-r--r-- | bash/bashrc.d/mysql.bash | 2 | ||||
| -rw-r--r-- | sh/profile | 2 | ||||
| -rw-r--r-- | sh/profile.d/remind.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/bash/bashrc b/bash/bashrc index abfc6267..8c74c136 100644 --- a/bash/bashrc +++ b/bash/bashrc @@ -80,7 +80,7 @@ fi # Load any supplementary scripts if [[ -d $HOME/.bashrc.d ]]; then for config in "$HOME"/.bashrc.d/*; do - [[ -f $config ]] && source "$config" + [[ -r $config ]] && source "$config" done fi unset -v config diff --git a/bash/bashrc.d/mysql.bash b/bash/bashrc.d/mysql.bash index fb1f7126..488fb02c 100644 --- a/bash/bashrc.d/mysql.bash +++ b/bash/bashrc.d/mysql.bash @@ -15,7 +15,7 @@ fi # mysql() { local config="$HOME"/.mysql/"$1".cnf - if [[ -f $config ]]; then + if [[ -r $config ]]; then shift command mysql --defaults-extra-file="$config" "$@" else @@ -7,7 +7,7 @@ export PATH # Load all supplementary scripts in ~/.profile.d if [ -d "$HOME"/.profile.d ]; then for config in "$HOME"/.profile.d/*; do - [ -f "$config" ] && . "$config" + [ -r "$config" ] && . "$config" done fi unset -v config diff --git a/sh/profile.d/remind.sh b/sh/profile.d/remind.sh index e3c82e40..eec279af 100644 --- a/sh/profile.d/remind.sh +++ b/sh/profile.d/remind.sh @@ -1,5 +1,5 @@ # Show reminders on login -if command -v remind >/dev/null 2>&1 && [ -f "$HOME"/.reminders ] ; then +if command -v remind >/dev/null 2>&1 && [ -r "$HOME"/.reminders ] ; then printf '\n' remind -q "$HOME"/.reminders | sed 's/^/* /' fi |