create a file with version; added proper information

3 files changed, 96 insertions, 23 deletions

diff --git a/makeself/jobs/99-makeself.install.sh b/makeself/jobs/99-makeself.install.sh
index 9d5a34b3a1..389acb37a7 100755
--- a/makeself/jobs/99-makeself.install.sh
+++ b/makeself/jobs/99-makeself.install.sh
@@ -84,4 +84,38 @@ rm "${NETDATA_INSTALL_PATH}/sbin" \
 
 # -----------------------------------------------------------------------------
 # copy it to the netdata build dir
-cp "${NETDATA_INSTALL_PATH}.gz.run" .
+
+NOWNER="unknown"
+ORIGIN="$(git config --get remote.origin.url)"
+if [[ "${ORIGIN}" =~ ^git@github.com:.*/netdata.*$ ]]
+    then
+    NOWNER="${ORIGIN/git@github.com:/}"
+    NOWNER="${NOWNER/\/netdata*/}"
+
+elif [[ "${ORIGIN}" =~ ^https://github.com/.*/netdata.*$ ]]
+    then
+    NOWNER="${ORIGIN/https:\/\/github.com\//}"
+    NOWNER="${NOWNER/\/netdata*/}"
+fi
+
+# make sure it does not have any slashes in it
+NOWNER="${NOWNER//\//_}"
+
+if [ "${NOWNER}" = "firehol" ]
+    then
+    NOWNER=
+else
+    NOWNER="-${NOWNER}"
+fi
+
+VERSION="$(git describe)"
+[ -z "${VERSION}" ] && VERSION="undefined"
+
+FILE="netdata-${VERSION}${NOWNER}.gz.run"
+
+cp "${NETDATA_INSTALL_PATH}.gz.run" "${FILE}"
+echo >&2 "Self-extracting installer copied to '${FILE}'"
+
+[ -f netdata-latest.gz.run ] && rm netdata-latest.gz.run
+ln -s "${FILE}" netdata-latest.gz.run
+echo >&2 "Self-extracting installer linked to 'netdata-latest.gz.run'"
diff --git a/makeself/makeself-help-header.txt b/makeself/makeself-help-header.txt
index 36e82824c1..eba364b1aa 100644
--- a/makeself/makeself-help-header.txt
+++ b/makeself/makeself-help-header.txt
@@ -9,18 +9,37 @@
 
   Released under GPL v3+
 
-  You are about to build and install netdata to your system.
-
-  It will be installed at these locations:
-
-   - the daemon     at /opt/netdata/usr/sbin/netdata
-   - config files   in /opt/netdata/etc/netdata
-   - web files      in /opt/netdata/usr/share/netdata
-   - plugins        in /opt/netdata/usr/libexec/netdata
-   - cache files    in /opt/netdata/var/cache/netdata
-   - db files       in /opt/netdata/var/lib/netdata
-   - log files      in /opt/netdata/var/log/netdata
-   - pid file       at /opt/netdata/var/run/netdata.pid
+  You are about to install netdata to this system.
+
+  It will be installed at:
+
+                    /opt/netdata
+
+  The following changes will be made to your system:
+
+  # USERS / GROUPS
+  User 'netdata' and group 'netdata' will be added, if not present.
+
+  # LOGROTATE
+  This file will be installed:
+
+   - /etc/logrotate.d/netdata
+
+  # SYSTEM INIT
+  If this system runs with systemd:
+
+   - /etc/systemd/system/netdata.service 
+
+   or, for older Centos, Debian/Ubuntu or OpenRC Gentoo:
+
+   - /etc/init.d/netdata         will be created
+
+  
+  This package can also update a netdata installation that has been
+  created with another version of it.
+
+  Your netdata configuration will be retained.
+  After installation, netdata will be (re-)started.
 
   netdata re-distributes a lot of open source software components.
   Check its full license at:
diff --git a/makeself/makeself-license.txt b/makeself/makeself-license.txt
index 5f8b75df66..5c6d22ae89 100644
--- a/makeself/makeself-license.txt
+++ b/makeself/makeself-license.txt
@@ -9,20 +9,40 @@
 
   Released under GPL v3+
 
-  You are about to build and install netdata to your system.
+  You are about to install netdata to this system.
 
-  It will be installed at these locations:
+  netdata will be installed at:
 
-   - the daemon     at /opt/netdata/usr/sbin/netdata
-   - config files   in /opt/netdata/etc/netdata
-   - web files      in /opt/netdata/usr/share/netdata
-   - plugins        in /opt/netdata/usr/libexec/netdata
-   - cache files    in /opt/netdata/var/cache/netdata
-   - db files       in /opt/netdata/var/lib/netdata
-   - log files      in /opt/netdata/var/log/netdata
-   - pid file       at /opt/netdata/var/run/netdata.pid
+                    /opt/netdata
+
+  The following changes will be made to your system:
+
+  # USERS / GROUPS
+  User 'netdata' and group 'netdata' will be added, if not present.
+
+  # LOGROTATE
+  This file will be installed if logrotate is present.
+
+   - /etc/logrotate.d/netdata
+
+  # SYSTEM INIT
+  If this system runs with systemd:
+
+   - /etc/systemd/system/netdata.service 
+
+   or, for older Centos, Debian/Ubuntu or OpenRC Gentoo:
+
+   - /etc/init.d/netdata         will be created
+
+  
+  This package can also update a netdata installation that has been
+  created with another version of it.
+
+  Your netdata configuration will be retained.
+  After installation, netdata will be (re-)started.
 
   netdata re-distributes a lot of open source software components.
   Check its full license at:
   https://github.com/firehol/netdata/blob/master/LICENSE.md
 
+