Simplify processor cores counting
This was already done from the functions.sh import, so remove it in makeself/run-all-jobs.sh
Vincent Legoll committed
Aug 7, 2017 at 09:55 UTC
ddd75409bd4743ea6988d9d2bbeb09dac1018330
3 files changed
+3
-8
makeself/functions.sh
+1
-1
@@ -7,7 +7,7 @@
7
[ -z "${NETDATA_MAKESELF_PATH}" ] && export NETDATA_MAKESELF_PATH="$(dirname "${0}")/.."
8
[ "${NETDATA_MAKESELF_PATH:0:1}" != "/" ] && export NETDATA_MAKESELF_PATH="$(pwd)/${NETDATA_MAKESELF_PATH}"
9
[ -z "${NETDATA_SOURCE_PATH}" ] && export NETDATA_SOURCE_PATH="${NETDATA_MAKESELF_PATH}/.."
10
-[ -z "${PROCESSORS}" ] && export PROCESSORS=$(cat /proc/cpuinfo 2>/dev/null | grep ^processor | wc -l)
10
+[ -z "${PROCESSORS}" ] && export PROCESSORS=$(grep -c ^processor /proc/cpuinfo)
11
[ -z "${PROCESSORS}" -o $((PROCESSORS)) -lt 1 ] && export PROCESSORS=1
12
export NULL=
13
makeself/run-all-jobs.sh
+1
-6
@@ -22,11 +22,6 @@ fi
22
# netdata source directory
23
export NETDATA_SOURCE_PATH="${NETDATA_MAKESELF_PATH}/.."
24
25
-# number of processors this system has
26
-PROCESSORS=$(cat /proc/cpuinfo 2>/dev/null | grep ^processor | wc -l)
27
-[ -z "${PROCESSORS}" -o $(( PROCESSORS )) -lt 1 ] && PROCESSORS=1
28
-export PROCESSORS
29
-
25
# make sure ${NULL} is empty
26
export NULL=
27
@@ -43,4 +38,4 @@ do
38
done
39
40
echo >&2 "All jobs for static packaging done successfully."
46
-exit 0
\ No newline at end of file
41
+exit 0
netdata-installer.sh
+1
-1
@@ -49,7 +49,7 @@ umask 002
49
# Be nice on production environments
50
renice 19 $$ >/dev/null 2>/dev/null
51
52
-processors=$(cat /proc/cpuinfo 2>/dev/null | grep ^processor | wc -l)
52
+processors=$(grep -c ^processor /proc/cpuinfo)
53
[ $(( processors )) -lt 1 ] && processors=1
54
55
# you can set CFLAGS before running installer