diff options
| author | Federico Ceratto <federico.ceratto@gmail.com> | 2018-03-27 21:28:27 +0000 |
|---|---|---|
| committer | Federico Ceratto <federico.ceratto@gmail.com> | 2018-03-27 21:28:27 +0000 |
| commit | eb7cc2640201f168bbd9a05799fd2dbe823bb57c (patch) | |
| tree | 1f88da02b7ee3c16ced7b5f7dc4aadb190766e7c /makeself/functions.sh | |
| parent | Release v. 1.9.0+dfsg-1 to Unstable (diff) | |
| parent | New upstream version 1.10.0+dfsg (diff) | |
| download | netdata-eb7cc2640201f168bbd9a05799fd2dbe823bb57c.tar.xz netdata-eb7cc2640201f168bbd9a05799fd2dbe823bb57c.zip | |
Update upstream source from tag 'upstream/1.10.0+dfsg'
Update to upstream version '1.10.0+dfsg'
with Debian dir fa5485f3d9aea3038a19eff06ba33374ac5c5d7c
Diffstat (limited to 'makeself/functions.sh')
| -rwxr-xr-x | makeself/functions.sh | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/makeself/functions.sh b/makeself/functions.sh index a72a1f411..839fc3226 100755 --- a/makeself/functions.sh +++ b/makeself/functions.sh @@ -8,8 +8,6 @@ [ -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=$(grep -c ^processor /proc/cpuinfo) -[ -z "${PROCESSORS}" -o $((PROCESSORS)) -lt 1 ] && export PROCESSORS=1 export NULL= # make sure the path does not end with / @@ -21,14 +19,7 @@ fi # find the parent directory export NETDATA_INSTALL_PARENT="$(dirname "${NETDATA_INSTALL_PATH}")" - -# debug -echo "ME=${0}" -echo "NETDATA_INSTALL_PARENT=${NETDATA_INSTALL_PARENT}" -echo "NETDATA_INSTALL_PATH=${NETDATA_INSTALL_PATH}" -echo "NETDATA_MAKESELF_PATH=${NETDATA_MAKESELF_PATH}" -echo "NETDATA_SOURCE_PATH=${NETDATA_SOURCE_PATH}" -echo "PROCESSORS=${PROCESSORS}" +# ----------------------------------------------------------------------------- # bash strict mode set -euo pipefail @@ -58,3 +49,13 @@ fetch() { # load the functions of the netdata-installer.sh . "${NETDATA_SOURCE_PATH}/installer/functions.sh" + +# ----------------------------------------------------------------------------- + +# debug +echo "ME=${0}" +echo "NETDATA_INSTALL_PARENT=${NETDATA_INSTALL_PARENT}" +echo "NETDATA_INSTALL_PATH=${NETDATA_INSTALL_PATH}" +echo "NETDATA_MAKESELF_PATH=${NETDATA_MAKESELF_PATH}" +echo "NETDATA_SOURCE_PATH=${NETDATA_SOURCE_PATH}" +echo "PROCESSORS=${SYSTEM_CPUS}" |