updated shebang for compatibility

diff --git a/charts.d/ap.chart.sh b/charts.d/ap.chart.sh
index ebd4808e5387148531735848418a2ccbe128788e..7b4f690bb47ece250d03c249e58f294560d3758f 100755 (executable)
--- a/charts.d/ap.chart.sh
+++ b/charts.d/ap.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+# no need for shebang - this file is loaded from charts.d.plugin
 
 # _update_every is a special variable - it holds the number of seconds
 # between the calls of the _update() function

diff --git a/charts.d/apache.chart.sh b/charts.d/apache.chart.sh
index 681651a0df303e5c46325b61409592379a78c633..837d752d26a87d3033afca28461c94347c5f6055 100755 (executable)
--- a/charts.d/apache.chart.sh
+++ b/charts.d/apache.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+# no need for shebang - this file is loaded from charts.d.plugin
 
 # the URL to download apache status info
 apache_url="http://127.0.0.1:80/server-status?auto"

diff --git a/charts.d/cpu_apps.chart.sh b/charts.d/cpu_apps.chart.sh
index 5a25163e1398ee4dda91c26bb1b3405f7a15229f..6b2513dcf04f9c0a8f1a9961d891196248305bf3 100755 (executable)
--- a/charts.d/cpu_apps.chart.sh
+++ b/charts.d/cpu_apps.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# no need for shebang - this file is loaded from charts.d.plugin
 
 # THIS PLUGIN IS OBSOLETE
 # USE apps.plugin INSTEAD

diff --git a/charts.d/cpufreq.chart.sh b/charts.d/cpufreq.chart.sh
index 7dd994e252a9d1a75bf79e606fdd9db0a858cccc..06f692fa691a78308309534f208cd6e001be49b7 100755 (executable)
--- a/charts.d/cpufreq.chart.sh
+++ b/charts.d/cpufreq.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# no need for shebang - this file is loaded from charts.d.plugin
 
 # if this chart is called X.chart.sh, then all functions and global variables
 # must start with X_

diff --git a/charts.d/exim.chart.sh b/charts.d/exim.chart.sh
index c5ed747b89941bdcfb59f551d24b5767eae3b276..54024c3ad6cba928d3dc1ae65f489c9e449b7c5f 100644 (file)
--- a/charts.d/exim.chart.sh
+++ b/charts.d/exim.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# no need for shebang - this file is loaded from charts.d.plugin
 
 exim_command=
 

diff --git a/charts.d/hddtemp.chart.sh b/charts.d/hddtemp.chart.sh
index fea9f8018cb2e231cec4be326f9aefdff910a2f3..41c3e2478092a7df949fe8cb0c8ca353e0abe00b 100755 (executable)
--- a/charts.d/hddtemp.chart.sh
+++ b/charts.d/hddtemp.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+# no need for shebang - this file is loaded from charts.d.plugin
 
 # if this chart is called X.chart.sh, then all functions and global variables
 # must start with X_

diff --git a/charts.d/load_average.chart.sh b/charts.d/load_average.chart.sh
index 4d86a8f4c00f341b851ef4f6674f876a16cf0680..e6790d8077672ec6331cca81104401fcf47e5999 100755 (executable)
--- a/charts.d/load_average.chart.sh
+++ b/charts.d/load_average.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# no need for shebang - this file is loaded from charts.d.plugin
 
 load_average_update_every=5
 load_priority=100

diff --git a/charts.d/mem_apps.chart.sh b/charts.d/mem_apps.chart.sh
index f537ada488f183690b88e88d5413cf2b9bad7276..ab95b361c88d178e0035006aa8fbf486261d72e1 100755 (executable)
--- a/charts.d/mem_apps.chart.sh
+++ b/charts.d/mem_apps.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# no need for shebang - this file is loaded from charts.d.plugin
 
 mem_apps_apps=
 

diff --git a/charts.d/mysql.chart.sh b/charts.d/mysql.chart.sh
index e2392c23dcdc1dff4615a0d4a54328b7e718e9a0..120fec66e32586d45e70847b0ff8444088d1a71f 100755 (executable)
--- a/charts.d/mysql.chart.sh
+++ b/charts.d/mysql.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+# no need for shebang - this file is loaded from charts.d.plugin
 
 # http://dev.mysql.com/doc/refman/5.0/en/server-status-variables.html
 #

diff --git a/charts.d/nginx.chart.sh b/charts.d/nginx.chart.sh
index a082c574e40fe5d945386458197d0e7eec1efdb9..a2a9b320fa2766d560a503d31c28f4820b90e986 100755 (executable)
--- a/charts.d/nginx.chart.sh
+++ b/charts.d/nginx.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+# no need for shebang - this file is loaded from charts.d.plugin
 
 # if this chart is called X.chart.sh, then all functions and global variables
 # must start with X_

diff --git a/charts.d/nut.chart.sh b/charts.d/nut.chart.sh
index a47208451b699735ba33b64f07b04c5a047a3cad..3c8e1c9d0548be6a3058932185f97049a5e290dd 100755 (executable)
--- a/charts.d/nut.chart.sh
+++ b/charts.d/nut.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+# no need for shebang - this file is loaded from charts.d.plugin
 
 # a space separated list of UPS names
 # if empty, the list returned by 'upsc -l' will be used

diff --git a/charts.d/opensips.chart.sh b/charts.d/opensips.chart.sh
index c7066ec05452a76556ae490c5bd963ed1ab20382..ce42ccdd70ced69aead6c873b51e54a086b8067b 100755 (executable)
--- a/charts.d/opensips.chart.sh
+++ b/charts.d/opensips.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# no need for shebang - this file is loaded from charts.d.plugin
 
 opensips_opts="fifo get_statistics all"
 opensips_cmd=

diff --git a/charts.d/phpfpm.chart.sh b/charts.d/phpfpm.chart.sh
index 7cd77269e7a787a0ed8dbb927ec3a226d1f49217..976ce91b198d260ebf8fa8ebf709abae6e636bb9 100755 (executable)
--- a/charts.d/phpfpm.chart.sh
+++ b/charts.d/phpfpm.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+# no need for shebang - this file is loaded from charts.d.plugin
 
 # if this chart is called X.chart.sh, then all functions and global variables
 # must start with X_

diff --git a/charts.d/postfix.chart.sh b/charts.d/postfix.chart.sh
index f4f710275432ec52c3eed037feec626c5401ea24..b37dbd5502784c674649409bc0c400301ebd8131 100755 (executable)
--- a/charts.d/postfix.chart.sh
+++ b/charts.d/postfix.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# no need for shebang - this file is loaded from charts.d.plugin
 
 # the postqueue command
 # if empty, it will use the one found in the system path

diff --git a/charts.d/sensors.chart.sh b/charts.d/sensors.chart.sh
index 06a35af2d961530516e539d09a4db7db14e745db..9652f896a0822f39cf65f7047fe5f05681daae99 100755 (executable)
--- a/charts.d/sensors.chart.sh
+++ b/charts.d/sensors.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# no need for shebang - this file is loaded from charts.d.plugin
 
 # sensors docs
 # https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface

diff --git a/charts.d/squid.chart.sh b/charts.d/squid.chart.sh
index 0eca99bc348ee235b17ce687800f90e06439e5d8..88280a3c164e96597fd3207ce89dbb459bed4574 100755 (executable)
--- a/charts.d/squid.chart.sh
+++ b/charts.d/squid.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# no need for shebang - this file is loaded from charts.d.plugin
 
 squid_host=
 squid_port=

diff --git a/charts.d/tomcat.chart.sh b/charts.d/tomcat.chart.sh
index 50a17e2b3fa3b15f4277a1599eba42d4abdfd774..cc6baea1ae1f967fe2210086d96ffb13ed8611b9 100755 (executable)
--- a/charts.d/tomcat.chart.sh
+++ b/charts.d/tomcat.chart.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+# no need for shebang - this file is loaded from charts.d.plugin
 
 # Description: Tomcat netdata charts.d plugin
 # Author: Jorge Romero

diff --git a/plugins.d/cgroup-name.sh b/plugins.d/cgroup-name.sh
index 8ce64b3d7718368a9dea1d2abdb220c07dc95064..3cd3cfab5e51a38c26c148dc20cc8aa360d7c6fd 100755 (executable)
--- a/plugins.d/cgroup-name.sh
+++ b/plugins.d/cgroup-name.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export PATH="${PATH}:/sbin:/usr/sbin:/usr/local/sbin"
 export LC_ALL=C

diff --git a/plugins.d/charts.d.dryrun-helper.sh b/plugins.d/charts.d.dryrun-helper.sh
index 64645289248bb28bc429d95e6e36139784c7cd00..9f024f6321ce4157750f12da632e3f4ae7a422b3 100755 (executable)
--- a/plugins.d/charts.d.dryrun-helper.sh
+++ b/plugins.d/charts.d.dryrun-helper.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # will stop the script for any error
 set -e

diff --git a/plugins.d/node.d.plugin b/plugins.d/node.d.plugin
index a1fa754faa959e1ba04c598b4a92779d915e4ba1..270351e4e5582cada1876edd54eb71d481d0c71b 100755 (executable)
--- a/plugins.d/node.d.plugin
+++ b/plugins.d/node.d.plugin
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 ':' //; exec "$(command -v nodejs || command -v node || command -v js || echo "ERROR node.js IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@"
 
 // shebang hack from:
@@ -42,12 +42,17 @@ var netdata = require('netdata');
 function pluginConfig(filename) {
        var f = path.basename(filename);
 
+       // node.d.plugin configuration
        var m = f.match('.plugin' + '$');
-       if(m === null) m = f.match('.node.js' + '$');
        if(m !== null)
                return netdata.options.paths.config + '/' + f.substring(0, m.index) + '.conf';
 
-       return netdata.options.paths.config + '/' + f + '.conf';
+       // node.d modules configuration
+       m = f.match('.node.js' + '$');
+       if(m !== null)
+               return netdata.options.paths.config + '/node.d/' + f.substring(0, m.index) + '.conf';
+
+       return netdata.options.paths.config + '/node.d/' + f + '.conf';
 }
 
 // internal defaults

diff --git a/plugins.d/tc-qos-helper.sh b/plugins.d/tc-qos-helper.sh
index 94eec44a569dac63bb521c661e34a2480032f2ca..a0edadac34605027fd90fd702b2cca4e7125810a 100755 (executable)
--- a/plugins.d/tc-qos-helper.sh
+++ b/plugins.d/tc-qos-helper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export PATH="${PATH}:/sbin:/usr/sbin:/usr/local/sbin"
 

diff --git a/python.d/python-modules-installer.sh.in b/python.d/python-modules-installer.sh.in
index 620a332b10d6026ba9bf9fc2be58b8a134c2734c..18f14f12c0d0c06634376b7158806c1774ecd4eb 100755 (executable)
--- a/python.d/python-modules-installer.sh.in
+++ b/python.d/python-modules-installer.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 umask 022