aboutsummaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2009-04-02 09:05:12 -0700
committerAaron Griffin <aaronmgriffin@gmail.com>2009-04-02 09:07:27 -0700
commit07d2701e269042015656bfbdacff8349ca77a687 (patch)
tree20a7b5df90332a645da35a2c848193c99129a20a /functions
parente679e9db7c09474da1411db3f18449a1f5e8cc6b (diff)
downloadinitscripts-07d2701e269042015656bfbdacff8349ca77a687.tar.xz
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 <aaronmgriffin@gmail.com>
Diffstat (limited to 'functions')
-rw-r--r--functions6
1 files changed, 4 insertions, 2 deletions
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: