From 07d2701e269042015656bfbdacff8349ca77a687 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Thu, 2 Apr 2009 09:05:12 -0700 Subject: Make sure functions ends cleanly When errexit was set, sourcing functions caused a script to exit. Fix this by using a real 'if' instead of the [ a ] && b syntax. Also, fix the vim modeline :) Signed-off-by: Aaron Griffin --- functions | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'functions') diff --git a/functions b/functions index 34285dd..ba37f57 100644 --- a/functions +++ b/functions @@ -190,8 +190,10 @@ ck_status() { #Source additional functions at the end to allow overrides for f in /etc/rc.d/functions.d/*; do - [ -e $f ] && . $f + if [ -e $f ]; then + . $f + fi done # End of file -# vim: set ts=2 noet: +# vim: set ft=sh sw=2 ts=2 et: -- cgit v1.2.3