diff options
| author | Costa Tsaousis <costa@tsaousis.gr> | 2018-07-08 04:16:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-08 04:16:15 +0300 |
| commit | 30bbfc27442479744b49813261a573fd8c98b343 (patch) | |
| tree | d73a9ff0c010adfeaa77d375cd6fa4d22186d49f | |
| parent | 07f25d0ae94c7e4fd1fd8c4463c62d31f6a0be42 (diff) | |
| parent | e54df054162d860a6c581ffda534f6f642389dc4 (diff) | |
Merge pull request #3942 from ktsaou/master
detect when netdata-installer.sh is run without ./
| -rw-r--r-- | configs.signatures | 3 | ||||
| -rwxr-xr-x | netdata-installer.sh | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/configs.signatures b/configs.signatures index 04b2a79205..9f1dd24441 100644 --- a/configs.signatures +++ b/configs.signatures @@ -129,6 +129,7 @@ declare -A configs_signatures=( ['2da0a2e7117292ece11d69723a294bd7']='python.d/mongodb.conf' ['2ee5df033fe9c65a45566b6760b856e3']='python.d/web_log.conf' ['2f05e09b69ea20cda56d8f8b6fd3e86d']='health.d/couchdb.conf' + ['2f13a6b7d11eda826ff26569b2a77080']='health.d/apcupsd.conf' ['2f3a8e33df83f14e0af8ca2465697215']='python.d/exim.conf' ['2f4a85fedecce1bf425fa1039f6b021e']='apps_groups.conf' ['2fa8fb929fd597f2ab97b6efc540a043']='health_alarm_notify.conf' @@ -251,6 +252,7 @@ declare -A configs_signatures=( ['579c7c41c756745f57afd11c94a879d7']='python.d.conf' ['57be306944cb09b7f024079728fd04b9']='apps_groups.conf' ['5829812db29598db5857c9f433e96fef']='python.d/apache.conf' + ['58439d9c1253e33c74b399e6853143ab']='health.d/apcupsd.conf' ['5855dd70d71c8497e5591b0690162c9c']='health.d/tcp_resets.conf' ['58660dfcc260f77deec94b328b3838e8']='health_alarm_notify.conf' ['58e835b7176865ec5a6f59f7aba832bf']='health.d/named.conf' @@ -386,6 +388,7 @@ declare -A configs_signatures=( ['87615ae5ac2412d853c717383fa53781']='python.d/chrony.conf' ['87642c568093daf3b2c30c5beffe2225']='python.d/elasticsearch.conf' ['8810140ce9c09af1d18b9602c4003904']='health_alarm_notify.conf' + ['886975ecb9a4e856151dc71024b122e6']='health.d/apcupsd.conf' ['8891fb423f6b987281d7913bb6c1c024']='health.d/ipc.conf' ['88e3b51b6b3fe8f317df82a2d4fbb990']='python.d.conf' ['88f77865f75c9fb61c97d700bd4561ee']='python.d/mysql.conf' diff --git a/netdata-installer.sh b/netdata-installer.sh index 59436a2104..1c77e8f86a 100755 --- a/netdata-installer.sh +++ b/netdata-installer.sh @@ -80,6 +80,7 @@ REINSTALL_COMMAND="$(printf "%q " "$0" "${@}"; printf "\n")" # remove options that shown not be inherited by netdata-updater.sh REINSTALL_COMMAND="${REINSTALL_COMMAND// --dont-wait/}" REINSTALL_COMMAND="${REINSTALL_COMMAND// --dont-start-it/}" +[ "${REINSTALL_COMMAND:0:1}" != "." -a "${REINSTALL_COMMAND:0:1}" != "/" -a -f "./${0}" ] && REINSTALL_COMMAND="./${REINSTALL_COMMAND}" setcap="$(which setcap 2>/dev/null || command -v setcap 2>/dev/null)" |