diff options
-rw-r--r-- | Makefile.am | 2 | ||||
-rwxr-xr-x | makeself/jobs/50-fping-4.0.install.sh (renamed from makeself/jobs/50-fping-3.16.install.sh) | 4 | ||||
-rwxr-xr-x | plugins.d/fping.plugin | 20 |
3 files changed, 7 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index e13eabdff4..c37cbcca73 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,7 +82,7 @@ dist_noinst_SCRIPTS= \ makeself/jobs/10-prepare-destination.install.sh \ makeself/jobs/50-curl-7.53.1.install.sh \ makeself/jobs/50-bash-4.4.install.sh \ - makeself/jobs/50-fping-3.16.install.sh \ + makeself/jobs/50-fping-4.0.install.sh \ makeself/jobs/70-netdata-git.install.sh \ makeself/jobs/99-makeself.install.sh \ makeself/run-all-jobs.sh \ diff --git a/makeself/jobs/50-fping-3.16.install.sh b/makeself/jobs/50-fping-4.0.install.sh index 40d8e425b1..d2b7502660 100755 --- a/makeself/jobs/50-fping-3.16.install.sh +++ b/makeself/jobs/50-fping-4.0.install.sh @@ -2,12 +2,10 @@ . $(dirname "${0}")/../functions.sh "${@}" || exit 1 -fetch "fping-3.16" "https://github.com/schweikert/fping/archive/3.16.tar.gz" +fetch "fping-4.0" "https://github.com/schweikert/fping/releases/download/v4.0/fping-4.0.tar.gz" export CFLAGS="-static" -run ./autogen.sh - run ./configure \ --prefix=${NETDATA_INSTALL_PATH} \ --enable-ipv4 \ diff --git a/plugins.d/fping.plugin b/plugins.d/fping.plugin index 232c00630f..050fd891cb 100755 --- a/plugins.d/fping.plugin +++ b/plugins.d/fping.plugin @@ -37,25 +37,15 @@ if [ "${1}" = "install" ] run cd /usr/src - if [ -d fping-3.15 ] + if [ -d fping-4.0 ] then - run rm -rf fping-3.15 || exit 1 + run rm -rf fping-4.0 || exit 1 fi - download 'https://github.com/schweikert/fping/archive/3.15.tar.gz' | run tar -zxvpf - + download 'https://github.com/schweikert/fping/releases/download/v4.0/fping-4.0.tar.gz' | run tar -zxvpf - [ $? -ne 0 ] && exit 1 - run cd fping-3.15 || exit 1 - - #if [ -d fping-ktsaou.git ] - # then - # run cd fping-ktsaou.git - # run git pull - #else - # run git clone https://github.com/ktsaou/fping.git fping-ktsaou.git - # run cd fping-ktsaou.git - #fi - - run ./autogen.sh + run cd fping-4.0 || exit 1 + run ./configure --prefix=/usr/local run make clean run make |