use official loadable modules dir
Costa Tsaousis (ktsaou) committed
May 26, 2018 at 16:26 UTC
a6d3c72db32bbde823ac6987dc46c14298aff1cf
1 file changed
+12
-11
plugins.d/loopsleepms.sh.inc
+12
-11
@@ -105,27 +105,28 @@ mysleep_read() {
105
# -----------------------------------------------------------------------------
106
# use bash loadable module for sleep
107
108
-# BASH_LOADABLE_MODULES_DIR can be used in various netdata config files to
109
-# set the directory the loadable bash modules can be found.
110
-
108
if [ "$((BASH_VERSINFO[0] +0))" -ge 3 ]
109
then
110
# enable modules only for bash version 3+
111
115
- for bash_modules_path in "${BASH_LOADABLE_MODULES_DIR}" "/usr/lib/bash" "/lib/bash" "/lib64/bash" "/usr/local/lib/bash" "/usr/local/lib64/bash"
112
+ for bash_modules_path in ${BASH_LOADABLES_PATH//:/ } "$(pkg-config bash --variable=loadablesdir 2>/dev/null)" "/usr/lib/bash" "/lib/bash" "/lib64/bash" "/usr/local/lib/bash" "/usr/local/lib64/bash"
113
do
114
[ -z "${bash_modules_path}" -o ! -d "${bash_modules_path}" ] && continue
115
116
# check for sleep
120
- if [ -f "${bash_modules_path}/sleep" ]
121
- then
122
- if enable -f "${bash_modules_path}/sleep" sleep 2>/dev/null
117
+ for bash_module_sleep in "sleep" "sleep.so"
118
+ do
119
+ if [ -f "${bash_modules_path}/${bash_module_sleep}" ]
120
then
124
- mysleep="sleep"
125
- #echo >&2 "$0: Using bash loadable ${bash_modules_path}/sleep for sleep"
126
- break
121
+ if enable -f "${bash_modules_path}/${bash_module_sleep}" sleep 2>/dev/null
122
+ then
123
+ mysleep="builtin sleep"
124
+ #echo >&2 "$0: Using bash loadable ${bash_modules_path}/sleep for sleep"
125
+ break
126
+ fi
127
fi
128
- fi
128
+ done
129
+
130
done
131
fi
132