diff options
| author | Vincent Legoll <vincent.legoll@gmail.com> | 2017-08-07 09:55:00 +0200 |
|---|---|---|
| committer | Vincent Legoll <vincent.legoll@gmail.com> | 2017-08-07 10:09:49 +0200 |
| commit | ddd75409bd4743ea6988d9d2bbeb09dac1018330 (patch) | |
| tree | 85b46e43bdbcabadb38a2666578651c10914c428 /makeself | |
| parent | df957395370e656a9961a5b3cfa8d4db80801282 (diff) | |
Simplify processor cores counting
This was already done from the functions.sh import, so remove it
in makeself/run-all-jobs.sh
Diffstat (limited to 'makeself')
| -rwxr-xr-x | makeself/functions.sh | 2 | ||||
| -rwxr-xr-x | makeself/run-all-jobs.sh | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/makeself/functions.sh b/makeself/functions.sh index 48835f0f5b..c015a97da4 100755 --- a/makeself/functions.sh +++ b/makeself/functions.sh @@ -7,7 +7,7 @@ [ -z "${NETDATA_MAKESELF_PATH}" ] && export NETDATA_MAKESELF_PATH="$(dirname "${0}")/.." [ "${NETDATA_MAKESELF_PATH:0:1}" != "/" ] && export NETDATA_MAKESELF_PATH="$(pwd)/${NETDATA_MAKESELF_PATH}" [ -z "${NETDATA_SOURCE_PATH}" ] && export NETDATA_SOURCE_PATH="${NETDATA_MAKESELF_PATH}/.." -[ -z "${PROCESSORS}" ] && export PROCESSORS=$(cat /proc/cpuinfo 2>/dev/null | grep ^processor | wc -l) +[ -z "${PROCESSORS}" ] && export PROCESSORS=$(grep -c ^processor /proc/cpuinfo) [ -z "${PROCESSORS}" -o $((PROCESSORS)) -lt 1 ] && export PROCESSORS=1 export NULL= diff --git a/makeself/run-all-jobs.sh b/makeself/run-all-jobs.sh index b08fa91877..2ad594380e 100755 --- a/makeself/run-all-jobs.sh +++ b/makeself/run-all-jobs.sh @@ -22,11 +22,6 @@ fi # netdata source directory export NETDATA_SOURCE_PATH="${NETDATA_MAKESELF_PATH}/.." -# number of processors this system has -PROCESSORS=$(cat /proc/cpuinfo 2>/dev/null | grep ^processor | wc -l) -[ -z "${PROCESSORS}" -o $(( PROCESSORS )) -lt 1 ] && PROCESSORS=1 -export PROCESSORS - # make sure ${NULL} is empty export NULL= @@ -43,4 +38,4 @@ do done echo >&2 "All jobs for static packaging done successfully." -exit 0
\ No newline at end of file +exit 0 |