From 9dcac1c4716ece1fe79e4e721d57b5b247947cad Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 15 Dec 2015 16:18:51 +1300 Subject: Make short-circuits a bit more explicit --- bash/bash_profile.d/fortune.bash | 8 ++++++-- bash/bash_profile.d/remind.bash | 14 ++++++++++---- bash/bash_profile.d/verse.bash | 8 ++++++-- 3 files changed, 22 insertions(+), 8 deletions(-) (limited to 'bash/bash_profile.d') diff --git a/bash/bash_profile.d/fortune.bash b/bash/bash_profile.d/fortune.bash index 9879716a..5105b02d 100644 --- a/bash/bash_profile.d/fortune.bash +++ b/bash/bash_profile.d/fortune.bash @@ -1,8 +1,12 @@ # Only if shell is interactive -[[ $- == *i* ]] || return +if [[ $- != *i* ]] ; then + return +fi # Only if fortune(6) available -hash fortune 2>/dev/null || return +if ! hash fortune 2>/dev/null ; then + return +fi # Print from subshell to keep namespace clean ( diff --git a/bash/bash_profile.d/remind.bash b/bash/bash_profile.d/remind.bash index d006bb20..92f13924 100644 --- a/bash/bash_profile.d/remind.bash +++ b/bash/bash_profile.d/remind.bash @@ -1,11 +1,17 @@ # Only if shell is interactive -[[ $- == *i* ]] || return +if [[ $- != *i* ]] ; then + return +fi # Only if rem(1) available -hash rem 2>/dev/null || return +if ! hash rem 2>/dev/null ; then + return +fi -# Only if $HOME/.reminders exists -[[ -e $HOME/.reminders ]] || return +# Only if reminders file exists +if [[ ! -e ${DOTREMINDERS:-$HOME/.reminders} ]] ; then + return +fi # Print from subshell to keep namespace clean ( diff --git a/bash/bash_profile.d/verse.bash b/bash/bash_profile.d/verse.bash index d7877a05..f463d074 100644 --- a/bash/bash_profile.d/verse.bash +++ b/bash/bash_profile.d/verse.bash @@ -1,8 +1,12 @@ # Only if shell is interactive -[[ $- == *i* ]] || return +if [[ $- != *i* ]] ; then + return +fi # Only if verse(1) available -hash fortune 2>/dev/null || return +if ! hash verse 2>/dev/null ; then + return +fi # Run verse(1) if we haven't seen it already today (the verses are selected by # date); run in a subshell to keep vars out of global namespace -- cgit v1.2.3