summaryrefslogtreecommitdiffstats
path: root/packaging/makeself/jobs
diff options
context:
space:
mode:
authorPaul Katsoulakis <34388743+paulkatsoulakis@users.noreply.github.com>2019-03-29 14:52:03 +0000
committerGitHub <noreply@github.com>2019-03-29 14:52:03 +0000
commitc8d2e6c7d3b955b6d5781e2710b02bccc29a3c79 (patch)
tree128c5354ba1d88e998d9fbbee0f7739f3ef2f073 /packaging/makeself/jobs
parentd97423136f70f69d9bbc4364f863d734d13905ff (diff)
netdata/packaging/installer: netdata-installer.sh script (and subscripts) refactoring wrap-up (#5736)
* remove dead quickfix * unify global variable naming * do not use double negation * simplify setcap detection * simplify logic of setting capabilities to apps.plugin * always set group in chown * simplify parameter parsing and banner notifications * use built-in command for checking program availability * lint functions.sh * fix errors returned by shellcheck * remove unused functions and use portable_service * move user management functions closer together and remove "check" functions to reduce levels of indirection * extract add_netdata_user_and_group and move it into installers for better code readability * improve readability by not using global variable holding number of processors * move netdata.conf file creation into one function * revert migration to portable_service * Less verbose setcap * remove TODOs * do not show output when not needed * fix checking for group existence * fix variable name * netdata/packaging/installer: Dont spill out unnecessary output in stdout/stderr, it may confuse our users The second commit was a follow up cleanup on nits. * access: change codeowner * Revert "access: change codeowner" This reverts commit 6ee51ccae960584d5b1b7c243f5aabf046a99eff. sorry, wrong repo * netdata/packaging/installer: bug fix - do not use pidof as the name of the helper method 1) rename to safe_pidof, which is actually more accurate and describe what this method serves for (safe pid detection) 2) Renaming it also avoids the bug introduced by the usage of , that resulted in endless nested calls of the BASH method pidif (Refer to command -v usage)
Diffstat (limited to 'packaging/makeself/jobs')
-rwxr-xr-xpackaging/makeself/jobs/50-bash-4.4.18.install.sh2
-rwxr-xr-xpackaging/makeself/jobs/50-curl-7.60.0.install.sh2
-rwxr-xr-xpackaging/makeself/jobs/50-fping-4.2.install.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/packaging/makeself/jobs/50-bash-4.4.18.install.sh b/packaging/makeself/jobs/50-bash-4.4.18.install.sh
index 3bdf3e7518..a762d37aef 100755
--- a/packaging/makeself/jobs/50-bash-4.4.18.install.sh
+++ b/packaging/makeself/jobs/50-bash-4.4.18.install.sh
@@ -38,7 +38,7 @@ run ./configure \
run make clean
-run make -j${SYSTEM_CPUS}
+run make -j$(find_processors)
cat >examples/loadables/Makefile <<EOF
all:
diff --git a/packaging/makeself/jobs/50-curl-7.60.0.install.sh b/packaging/makeself/jobs/50-curl-7.60.0.install.sh
index 2b5c8f1394..c91598251f 100755
--- a/packaging/makeself/jobs/50-curl-7.60.0.install.sh
+++ b/packaging/makeself/jobs/50-curl-7.60.0.install.sh
@@ -25,7 +25,7 @@ run ./configure \
run sed -i -e "s/curl_LDFLAGS =/curl_LDFLAGS = -all-static/" src/Makefile
run make clean
-run make -j${SYSTEM_CPUS}
+run make -j$(find_processors)
run make install
if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]
diff --git a/packaging/makeself/jobs/50-fping-4.2.install.sh b/packaging/makeself/jobs/50-fping-4.2.install.sh
index b1acfa2e45..a137753d8e 100755
--- a/packaging/makeself/jobs/50-fping-4.2.install.sh
+++ b/packaging/makeself/jobs/50-fping-4.2.install.sh
@@ -20,7 +20,7 @@ install:
EOF
run make clean
-run make -j${SYSTEM_CPUS}
+run make -j$(find_processors)
run make install
if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]