diff --git a/.gitignore b/.gitignore
index a63ceede73..bfc3ce66f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,7 +56,7 @@ packaging/installer/.environment.sh
*.run
# netdata makeself downloads
-makeself/tmp/
+packaging/makeself/tmp/
# coverity
cov-int/
diff --git a/.travis/create_artifacts.sh b/.travis/create_artifacts.sh
index 203fef256f..22d8184687 100755
--- a/.travis/create_artifacts.sh
+++ b/.travis/create_artifacts.sh
@@ -14,7 +14,7 @@ autoreconf -ivf
./configure
make dist
echo "--- Create self-extractor ---"
-./makeself/build-x86_64-static.sh
+./packaging/makeself/build-x86_64-static.sh
# Needed fo GCS
echo "--- Copy artifacts to bin ---"
diff --git a/Makefile.am b/Makefile.am
index bac00e4662..bc1ce0ed75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,7 +47,6 @@ EXTRA_DIST = \
SUBDIRS = \
diagrams \
- makeself \
system \
tests \
$(NULL)
diff --git a/configure.ac b/configure.ac
index 19076ed8ae..8458c9eb7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -589,7 +589,6 @@ AC_CONFIG_FILES([
libnetdata/storage_number/Makefile
libnetdata/threads/Makefile
libnetdata/url/Makefile
- makeself/Makefile
registry/Makefile
streaming/Makefile
system/Makefile
diff --git a/makeself/Makefile.am b/makeself/Makefile.am
deleted file mode 100644
index f6f9167a08..0000000000
--- a/makeself/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
-
-dist_noinst_DATA = \
- $(NULL)
-
-dist_noinst_SCRIPTS = \
- build.sh \
- makeself.sh \
- makeself-license.txt \
- install-alpine-packages.sh \
- post-installer.sh \
- jobs/10-prepare-destination.install.sh \
- jobs/50-curl-7.60.0.install.sh \
- jobs/50-bash-4.4.18.install.sh \
- jobs/50-fping-4.0.install.sh \
- jobs/70-netdata-git.install.sh \
- jobs/99-makeself.install.sh \
- run-all-jobs.sh \
- install-or-update.sh \
- build-x86_64-static.sh \
- makeself-header.sh \
- makeself-help-header.txt \
- makeself.lsm \
- functions.sh \
- $(NULL)
diff --git a/makeself/README.md b/packaging/makeself/README.md
similarity index 95%
rename from makeself/README.md
rename to packaging/makeself/README.md
index 60a6f4ba81..eb4c380b11 100644
--- a/makeself/README.md
+++ b/packaging/makeself/README.md
@@ -4,7 +4,7 @@ To build the static binary 64-bit distribution package, run:
```bash
$ cd /path/to/netdata.git
-$ ./makeself/build-x86_64-static.sh
+$ ./packaging/makeself/build-x86_64-static.sh
```
The program will:
@@ -24,7 +24,7 @@ To build netdata binaries with debugging / tracing information in them, use:
```bash
$ cd /path/to/netdata.git
-$ ./makeself/build-x86_64-static.sh debug
+$ ./packaging/makeself/build-x86_64-static.sh debug
```
These binaries are not optimized (they are a bit slower), they have certain features disables (like log flood protection), other features enables (like `debug flags`) and are not stripped (the binary files are bigger, since they now include source code tracing information).
diff --git a/makeself/build-x86_64-static.sh b/packaging/makeself/build-x86_64-static.sh
similarity index 85%
rename from makeself/build-x86_64-static.sh
rename to packaging/makeself/build-x86_64-static.sh
index f151d5d7ce..69ddf2bf54 100755
--- a/makeself/build-x86_64-static.sh
+++ b/packaging/makeself/build-x86_64-static.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# SPDX-License-Identifier: GPL-3.0-or-later
-. $(dirname "$0")/../packaging/installer/functions.sh || exit 1
+. $(dirname "$0")/../installer/functions.sh || exit 1
set -e
@@ -23,7 +23,7 @@ then
# (also inside the container)
#
run sudo docker run -v $(pwd):/usr/src/netdata.git:rw alpine:3.7 \
- /bin/sh /usr/src/netdata.git/makeself/install-alpine-packages.sh
+ /bin/sh /usr/src/netdata.git/packaging/makeself/install-alpine-packages.sh
# save the changes made permanently
id=$(sudo docker ps -l -q)
@@ -34,7 +34,7 @@ fi
run sudo docker run -a stdin -a stdout -a stderr -i -t -v \
$(pwd):/usr/src/netdata.git:rw \
"${DOCKER_CONTAINER_NAME}" \
- /bin/sh /usr/src/netdata.git/makeself/build.sh "${@}"
+ /bin/sh /usr/src/netdata.git/packaging/makeself/build.sh "${@}"
if [ "${USER}" ]
then
diff --git a/makeself/build.sh b/packaging/makeself/build.sh
similarity index 97%
rename from makeself/build.sh
rename to packaging/makeself/build.sh
index e8c1c9ddc7..e5804c5237 100755
--- a/makeself/build.sh
+++ b/packaging/makeself/build.sh
@@ -31,7 +31,7 @@ cd $(dirname "$0") || exit 1
# if we don't run inside the netdata repo
# download it and run from it
-if [ ! -f ../netdata-installer.sh ]
+if [ ! -f ../../netdata-installer.sh ]
then
git clone https://github.com/netdata/netdata.git netdata.git || exit 1
cd netdata.git/makeself || exit 1
diff --git a/makeself/functions.sh b/packaging/makeself/functions.sh
similarity index 97%
rename from makeself/functions.sh
rename to packaging/makeself/functions.sh
index cf4a54c6f8..6c68e5907e 100755
--- a/makeself/functions.sh
+++ b/packaging/makeself/functions.sh
@@ -6,9 +6,9 @@
# allow running the jobs by hand
[ -z "${NETDATA_BUILD_WITH_DEBUG}" ] && export NETDATA_BUILD_WITH_DEBUG=0
[ -z "${NETDATA_INSTALL_PATH}" ] && export NETDATA_INSTALL_PATH="${1-/opt/netdata}"
-[ -z "${NETDATA_MAKESELF_PATH}" ] && export NETDATA_MAKESELF_PATH="$(dirname "${0}")/.."
+[ -z "${NETDATA_MAKESELF_PATH}" ] && export NETDATA_MAKESELF_PATH="$(dirname "${0}")/../.."
[ "${NETDATA_MAKESELF_PATH:0:1}" != "/" ] && export NETDATA_MAKESELF_PATH="$(pwd)/${NETDATA_MAKESELF_PATH}"
-[ -z "${NETDATA_SOURCE_PATH}" ] && export NETDATA_SOURCE_PATH="${NETDATA_MAKESELF_PATH}/.."
+[ -z "${NETDATA_SOURCE_PATH}" ] && export NETDATA_SOURCE_PATH="${NETDATA_MAKESELF_PATH}/../.."
export NULL=
# make sure the path does not end with /
@@ -35,7 +35,7 @@ fetch() {
then
run wget -O "${NETDATA_MAKESELF_PATH}/tmp/${tar}" "${url}"
fi
-
+
if [ ! -d "${NETDATA_MAKESELF_PATH}/tmp/${dir}" ]
then
cd "${NETDATA_MAKESELF_PATH}/tmp"
diff --git a/makeself/install-alpine-packages.sh b/packaging/makeself/install-alpine-packages.sh
similarity index 100%
rename from makeself/install-alpine-packages.sh
rename to packaging/makeself/install-alpine-packages.sh
diff --git a/makeself/install-or-update.sh b/packaging/makeself/install-or-update.sh
similarity index 100%
rename from makeself/install-or-update.sh
rename to packaging/makeself/install-or-update.sh
diff --git a/makeself/jobs/10-prepare-destination.install.sh b/packaging/makeself/jobs/10-prepare-destination.install.sh
similarity index 99%
rename from makeself/jobs/10-prepare-destination.install.sh
rename to packaging/makeself/jobs/10-prepare-destination.install.sh
index 019732636b..06dc82f294 100755
--- a/makeself/jobs/10-prepare-destination.install.sh
+++ b/packaging/makeself/jobs/10-prepare-destination.install.sh
@@ -14,4 +14,3 @@ run cd "${NETDATA_INSTALL_PATH}/usr"
run ln -s ../bin bin
run ln -s ../sbin sbin
run ln -s . local
-
diff --git a/makeself/jobs/50-bash-4.4.18.install.sh b/packaging/makeself/jobs/50-bash-4.4.18.install.sh
similarity index 99%
rename from makeself/jobs/50-bash-4.4.18.install.sh
rename to packaging/makeself/jobs/50-bash-4.4.18.install.sh
index 0007658257..3bdf3e7518 100755
--- a/makeself/jobs/50-bash-4.4.18.install.sh
+++ b/packaging/makeself/jobs/50-bash-4.4.18.install.sh
@@ -35,7 +35,7 @@ run ./configure \
# --enable-prompt-string-decoding \
# --enable-readline \
# --enable-select \
-
+
run make clean
run make -j${SYSTEM_CPUS}
diff --git a/makeself/jobs/50-curl-7.60.0.install.sh b/packaging/makeself/jobs/50-curl-7.60.0.install.sh
similarity index 100%
rename from makeself/jobs/50-curl-7.60.0.install.sh
rename to packaging/makeself/jobs/50-curl-7.60.0.install.sh
diff --git a/makeself/jobs/50-fping-4.0.install.sh b/packaging/makeself/jobs/50-fping-4.0.install.sh
similarity index 100%
rename from makeself/jobs/50-fping-4.0.install.sh
rename to packaging/makeself/jobs/50-fping-4.0.install.sh
diff --git a/makeself/jobs/70-netdata-git.install.sh b/packaging/makeself/jobs/70-netdata-git.install.sh
similarity index 100%
rename from makeself/jobs/70-netdata-git.install.sh
rename to packaging/makeself/jobs/70-netdata-git.install.sh
diff --git a/makeself/jobs/99-makeself.install.sh b/packaging/makeself/jobs/99-makeself.install.sh
similarity index 97%
rename from makeself/jobs/99-makeself.install.sh
rename to packaging/makeself/jobs/99-makeself.install.sh
index f8a25da437..742bb4b424 100755
--- a/makeself/jobs/99-makeself.install.sh
+++ b/packaging/makeself/jobs/99-makeself.install.sh
@@ -43,8 +43,8 @@ FILE_VERSION="${VERSION}-$(uname -m)-$(date +"%Y%m%d-%H%M%S")${NOWNER}"
run mkdir -p "${NETDATA_INSTALL_PATH}/system"
run cp \
- makeself/post-installer.sh \
- makeself/install-or-update.sh \
+ packaging/makeself/post-installer.sh \
+ packaging/makeself/install-or-update.sh \
packaging/installer/functions.sh \
configs.signatures \
system/netdata-init-d \
diff --git a/makeself/makeself-header.sh b/packaging/makeself/makeself-header.sh
similarity index 99%
rename from makeself/makeself-header.sh
rename to packaging/makeself/makeself-header.sh
index 19c1c3f994..d77e1717c8 100755
--- a/makeself/makeself-header.sh
+++ b/packaging/makeself/makeself-header.sh
@@ -35,7 +35,7 @@ elif test -x /usr/ucb/echo; then
else
print_cmd="echo"
fi
-
+
if test -d /usr/xpg4/bin; then
PATH=/usr/xpg4/bin:\$PATH
export PATH
@@ -388,7 +388,7 @@ fi
if test x"$NEED_ROOT" = xy -a \`id -u\` -ne 0; then
echo "Administrative privileges required for this archive (use su or sudo)" >&2
- exit 1
+ exit 1
fi
if test x"\$copy" \!= xphase2; then
diff --git a/makeself/makeself-help-header.txt b/packaging/makeself/makeself-help-header.txt
similarity index 92%
rename from makeself/makeself-help-header.txt
rename to packaging/makeself/makeself-help-header.txt
index 6e9e96237e..bf482c465e 100644
--- a/makeself/makeself-help-header.txt
+++ b/packaging/makeself/makeself-help-header.txt
@@ -1,7 +1,7 @@
^
- |.-. .-. .-. .-. . netdata
- | '-' '-' '-' '-' real-time performance monitoring, done right!
+ |.-. .-. .-. .-. . netdata
+ | '-' '-' '-' '-' real-time performance monitoring, done right!
+----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+--->
(C) Copyright 2017, Costa Tsaousis
@@ -32,7 +32,7 @@
- /etc/init.d/netdata will be created
-
+
This package can also update a netdata installation that has been
created with another version of it.
@@ -42,5 +42,3 @@
netdata re-distributes a lot of open source software components.
Check its full license at:
https://github.com/netdata/netdata/blob/master/LICENSE.md
-
-
diff --git a/makeself/makeself-license.txt b/packaging/makeself/makeself-license.txt
similarity index 92%
rename from makeself/makeself-license.txt
rename to packaging/makeself/makeself-license.txt
index 6e9e96237e..bf482c465e 100644
--- a/makeself/makeself-license.txt
+++ b/packaging/makeself/makeself-license.txt
@@ -1,7 +1,7 @@
^
- |.-. .-. .-. .-. . netdata
- | '-' '-' '-' '-' real-time performance monitoring, done right!
+ |.-. .-. .-. .-. . netdata
+ | '-' '-' '-' '-' real-time performance monitoring, done right!
+----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+--->
(C) Copyright 2017, Costa Tsaousis
@@ -32,7 +32,7 @@
- /etc/init.d/netdata will be created
-
+
This package can also update a netdata installation that has been
created with another version of it.
@@ -42,5 +42,3 @@
netdata re-distributes a lot of open source software components.
Check its full license at:
https://github.com/netdata/netdata/blob/master/LICENSE.md
-
-
diff --git a/makeself/makeself.lsm b/packaging/makeself/makeself.lsm
similarity index 100%
rename from makeself/makeself.lsm
rename to packaging/makeself/makeself.lsm
diff --git a/makeself/makeself.sh b/packaging/makeself/makeself.sh
similarity index 98%
rename from makeself/makeself.sh
rename to packaging/makeself/makeself.sh
index ee89df9a45..f3cb69976e 100755
--- a/makeself/makeself.sh
+++ b/packaging/makeself/makeself.sh
@@ -21,13 +21,13 @@
# support for non-temporary archives. Ideas thanks to Francois Petitjean
# - 1.3 : More patches from Bjarni R. Einarsson and Francois Petitjean:
# Support for no compression (--nocomp), script is no longer mandatory,
-# automatic launch in an xterm, optional verbose output, and -target
+# automatic launch in an xterm, optional verbose output, and -target
# archive option to indicate where to extract the files.
# - 1.4 : Improved UNIX compatibility (Francois Petitjean)
# Automatic integrity checking, support of LSM files (Francois Petitjean)
# - 1.5 : Many bugfixes. Optionally disable xterm spawning.
# - 1.5.1 : More bugfixes, added archive options -list and -check.
-# - 1.5.2 : Cosmetic changes to inform the user of what's going on with big
+# - 1.5.2 : Cosmetic changes to inform the user of what's going on with big
# archives (Quake III demo)
# - 1.5.3 : Check for validity of the DISPLAY variable before launching an xterm.
# More verbosity in xterms and check for embedded command's return value.
@@ -204,9 +204,9 @@ do
shift
;;
--pigz)
- COMPRESS=pigz
- shift
- ;;
+ COMPRESS=pigz
+ shift
+ ;;
--xz)
COMPRESS=xz
shift
@@ -434,7 +434,7 @@ gzip)
GZIP_CMD="gzip -c$COMPRESS_LEVEL"
GUNZIP_CMD="gzip -cd"
;;
-pigz)
+pigz)
GZIP_CMD="pigz -$COMPRESS_LEVEL"
GUNZIP_CMD="gzip -cd"
;;
@@ -497,7 +497,7 @@ if test -f "$HEADER"; then
SKIP=`expr $SKIP`
rm -f "$tmpfile"
if test "$QUIET" = "n";then
- echo Header is $SKIP lines long >&2
+ echo Header is $SKIP lines long >&2
fi
archname="$oldarchname"
@@ -506,7 +506,7 @@ else
exit 1
fi
-if test "$QUIET" = "n";then
+if test "$QUIET" = "n";then
echo
fi
@@ -598,7 +598,7 @@ if test "$APPEND" = y; then
chmod +x "$archname"
rm -f "$archname".bak
if test "$QUIET" = "n";then
- echo Self-extractable archive \"$archname\" successfully updated.
+ echo Self-extractable archive \"$archname\" successfully updated.
fi
else
filesizes="$fsize"
@@ -610,12 +610,12 @@ else
# Append the compressed tar data after the stub
if test "$QUIET" = "n";then
- echo
+ echo
fi
cat "$tmpfile" >> "$archname"
chmod +x "$archname"
if test "$QUIET" = "n";then
- echo Self-extractable archive \"$archname\" successfully created.
+ echo Self-extractable archive \"$archname\" successfully created.
fi
fi
rm -f "$tmpfile"
diff --git a/makeself/post-installer.sh b/packaging/makeself/post-installer.sh
similarity index 100%
rename from makeself/post-installer.sh
rename to packaging/makeself/post-installer.sh
diff --git a/makeself/run-all-jobs.sh b/packaging/makeself/run-all-jobs.sh
similarity index 93%
rename from makeself/run-all-jobs.sh
rename to packaging/makeself/run-all-jobs.sh
index 7a35fe6486..f7507c2d2c 100755
--- a/makeself/run-all-jobs.sh
+++ b/packaging/makeself/run-all-jobs.sh
@@ -21,7 +21,7 @@ if [ "${NETDATA_MAKESELF_PATH:0:1}" != "/" ]
fi
# netdata source directory
-export NETDATA_SOURCE_PATH="${NETDATA_MAKESELF_PATH}/.."
+export NETDATA_SOURCE_PATH="${NETDATA_MAKESELF_PATH}/../.."
# make sure ${NULL} is empty
export NULL=