summaryrefslogtreecommitdiffstats
path: root/packaging/installer/functions.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-12-01 06:15:11 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-12-01 06:15:11 +0000
commit483926a283e118590da3f9ecfa75a8a4d62143ce (patch)
treecb77052778df9a128a8cd3ff5bf7645322a13bc5 /packaging/installer/functions.sh
parentReleasing debian version 1.31.0-4. (diff)
downloadnetdata-483926a283e118590da3f9ecfa75a8a4d62143ce.tar.xz
netdata-483926a283e118590da3f9ecfa75a8a4d62143ce.zip
Merging upstream version 1.32.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'packaging/installer/functions.sh')
-rw-r--r--packaging/installer/functions.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/packaging/installer/functions.sh b/packaging/installer/functions.sh
index fd10fcfaf..6264c1131 100644
--- a/packaging/installer/functions.sh
+++ b/packaging/installer/functions.sh
@@ -224,17 +224,22 @@ safe_pidof() {
# -----------------------------------------------------------------------------
find_processors() {
- # Most UNIX systems have `nproc` as part of their userland (including macOS, Linux and BSD)
+ # Most UNIX systems have `nproc` as part of their userland (including Linux and BSD)
if command -v nproc > /dev/null; then
nproc && return
fi
+ # macOS has no nproc but it may have gnproc installed from Homebrew or from Macports.
+ if command -v gnproc > /dev/null; then
+ gnproc && return
+ fi
+
local cpus
if [ -f "/proc/cpuinfo" ]; then
# linux
cpus=$(grep -c ^processor /proc/cpuinfo)
else
- # freebsd
+ # freebsd
cpus=$(sysctl hw.ncpu 2> /dev/null | grep ^hw.ncpu | cut -d ' ' -f 2)
fi
if [ -z "${cpus}" ] || [ $((cpus)) -lt 1 ]; then