From 9e14f88561ba1efacc63e9446f0c28bfe6922704 Mon Sep 17 00:00:00 2001 From: "Paul Emm. Katsoulakis" <34388743+paulkatsoulakis@users.noreply.github.com> Date: Thu, 2 May 2019 16:59:52 +0300 Subject: [PATCH] netdata/packaging/ci: Make timeout usage more cross-distro compliant (#5938) * netdata/packaging/ci: #5935 - Make timeout usage more cross-distro compliant * netdata/collectors: use existing system info variable NETDATA_SYSTEM_OS_ID --- collectors/charts.d.plugin/charts.d.plugin.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in index 05a63875b32577..a3f0aa95435b8d 100755 --- a/collectors/charts.d.plugin/charts.d.plugin.in +++ b/collectors/charts.d.plugin/charts.d.plugin.in @@ -281,7 +281,14 @@ run() { if [ "z${1}" = "z-t" -a "${2}" != "0" ]; then t="${2}" shift 2 - timeout ${t} "${@}" 2>"${TMP_DIR}/run.${pid}" + case "${NETDATA_SYSTEM_OS_ID}" in + "alpine") + timeout -t ${t} "${@}" 2>"${TMP_DIR}/run.${pid}" + ;; + *) + timeout ${t} "${@}" 2>"${TMP_DIR}/run.${pid}" + ;; + esac ret=$? else "${@}" 2>"${TMP_DIR}/run.${pid}"