From 7b1b82761bcab157de124def3944dd95b19268b6 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 15 Dec 2015 16:01:07 +1300 Subject: Flatten bash_profile.d subscripts a bit --- bash/bash_profile.d/fortune.bash | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'bash/bash_profile.d/fortune.bash') diff --git a/bash/bash_profile.d/fortune.bash b/bash/bash_profile.d/fortune.bash index f3ef2be9..9879716a 100644 --- a/bash/bash_profile.d/fortune.bash +++ b/bash/bash_profile.d/fortune.bash @@ -1,10 +1,16 @@ -# If interactive shell and fortune(6) installed, print a short fortune -if [[ $- == *i* ]] && hash fortune 2>/dev/null ; then ( +# Only if shell is interactive +[[ $- == *i* ]] || return + +# Only if fortune(6) available +hash fortune 2>/dev/null || return + +# Print from subshell to keep namespace clean +( if [[ -d $HOME/.local/share/games/fortunes ]] ; then FORTUNE_PATH=${FORTUNE_PATH:-$HOME/.local/share/games/fortunes} fi printf '\n' fortune -sn "${FORTUNE_MAXSIZE:-768}" "$FORTUNE_PATH" printf '\n' -) ; fi +) -- cgit v1.2.3