Merge remote-tracking branch 'upstream/master' into registry

[netdata.git] / netdata-installer.sh

diff --git a/netdata-installer.sh b/netdata-installer.sh
index 918690ff6ceee0c3e4521e1336c03fd626f160bf..d8c073ae57771730df547f789723327b0594e263 100755 (executable)
--- a/netdata-installer.sh
+++ b/netdata-installer.sh
@@ -67,7 +67,7 @@ If you need to pass different CFLAGS, use something like this:
 For the installer to complete successfully, you will need
 these packages installed:
 
-   gcc make autoconf automake pkg-config zlib1g-dev
+   gcc make autoconf automake pkg-config zlib1g-dev uuid-dev
 
 For the plugins, you will at least need:
 
@@ -121,6 +121,7 @@ It will be installed at these locations:
   - web files     at ${NETDATA_PREFIX}/usr/share/netdata
   - plugins       at ${NETDATA_PREFIX}/usr/libexec/netdata
   - cache files   at ${NETDATA_PREFIX}/var/cache/netdata
+  - db files      at ${NETDATA_PREFIX}/var/lib/netdata
   - log files     at ${NETDATA_PREFIX}/var/log/netdata
   - pid file      at ${NETDATA_PREFIX}/var/run
 
@@ -248,15 +249,16 @@ You many need to check these:
 
 1. The package zlib1g-dev has to be installed.
 
-2. You need basic build tools installed, like:
+   If your system cannot find ZLIB, although it is installed
+   run me with the option:  --zlib-is-really-here
 
-   gcc make autoconf automake pkg-config
+2. The package uuid-dev has to be installed.
 
-   Autoconf version 2.60 or higher is required
+3. You need basic build tools installed, like:
 
-3. If your system cannot find ZLIB, although it is installed
-   run me with the option:  --zlib-is-really-here
+   gcc make autoconf automake pkg-config
 
+   Autoconf version 2.60 or higher is required.
 
 If you still cannot get it to build, ask for help at github:
 
@@ -408,6 +410,7 @@ defport=19999
 NETDATA_PORT="$( config_option "port" ${defport} )"
 
 # directories
+NETDATA_LIB_DIR="$( config_option "lib directory" "${NETDATA_PREFIX}/var/lib/netdata" )"
 NETDATA_CACHE_DIR="$( config_option "cache directory" "${NETDATA_PREFIX}/var/cache/netdata" )"
 NETDATA_WEB_DIR="$( config_option "web files directory" "${NETDATA_PREFIX}/usr/share/netdata/web" )"
 NETDATA_LOG_DIR="$( config_option "log directory" "${NETDATA_PREFIX}/var/log/netdata" )"
@@ -426,7 +429,7 @@ if [ ! -d "${NETDATA_RUN_DIR}" ]
 fi
 
 echo >&2 "Fixing directories (user: ${NETDATA_USER})..."
-for x in "${NETDATA_WEB_DIR}" "${NETDATA_CONF_DIR}" "${NETDATA_CACHE_DIR}" "${NETDATA_LOG_DIR}"
+for x in "${NETDATA_WEB_DIR}" "${NETDATA_CONF_DIR}" "${NETDATA_CACHE_DIR}" "${NETDATA_LOG_DIR}" "${NETDATA_LIB_DIR}"
 do
        if [ ! -d "${x}" ]
                then
@@ -717,6 +720,7 @@ else
        deletedir "${NETDATA_PREFIX}/etc/netdata"
        deletedir "${NETDATA_PREFIX}/usr/share/netdata"
        deletedir "${NETDATA_PREFIX}/usr/libexec/netdata"
+       deletedir "${NETDATA_PREFIX}/var/lib/netdata"
        deletedir "${NETDATA_PREFIX}/var/cache/netdata"
        deletedir "${NETDATA_PREFIX}/var/log/netdata"
 fi