increase verbisity during static build
Costa Tsaousis (ktsaou) committed
Dec 14, 2017 at 02:14 UTC
021c223735f5860cbbef31999e978dbfee0b1f04
2 files changed
+25
-15
makeself/jobs/70-netdata-git.install.sh
+7
-3
@@ -11,14 +11,18 @@ else
11
export CFLAGS="-static -O1 -ggdb -Wall -Wextra -Wformat-signedness -fstack-protector-all -D_FORTIFY_SOURCE=2 -DNETDATA_INTERNAL_CHECKS=1"
12
fi
13
14
+if [ ! -z "${NETDATA_INSTALL_PATH}" -a -d "${NETDATA_INSTALL_PATH}/etc" ]
15
+ then
16
+ # make sure we don't have an old etc path, so that the installer
17
+ # will install all files without examining changes
18
+ run mv "${NETDATA_INSTALL_PATH}/etc" "${NETDATA_INSTALL_PATH}/etc.new"
19
+fi
20
+
21
run ./netdata-installer.sh --install "${NETDATA_INSTALL_PARENT}" \
22
--dont-wait \
23
--dont-start-it \
24
${NULL}
25
19
-# delete the generated netdata.conf, so that the static installer will generate a new one
20
-rm "${NETDATA_INSTALL_PATH}/etc/netdata/netdata.conf"
21
-
26
if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]
27
then
28
run strip ${NETDATA_INSTALL_PATH}/bin/netdata
makeself/jobs/99-makeself.install.sh
+18
-12
@@ -41,7 +41,7 @@ FILE_VERSION="${VERSION}-$(uname -m)-$(date +"%Y%m%d-%H%M%S")${NOWNER}"
41
42
run mkdir -p "${NETDATA_INSTALL_PATH}/system"
43
44
-cp \
44
+run cp \
45
makeself/post-installer.sh \
46
makeself/install-or-update.sh \
47
installer/functions.sh \
@@ -57,9 +57,9 @@ cp \
57
# -----------------------------------------------------------------------------
58
# create a wrapper to start our netdata with a modified path
59
60
-mkdir -p "${NETDATA_INSTALL_PATH}/bin/srv"
60
+run mkdir -p "${NETDATA_INSTALL_PATH}/bin/srv"
61
62
-mv "${NETDATA_INSTALL_PATH}/bin/netdata" \
62
+run mv "${NETDATA_INSTALL_PATH}/bin/netdata" \
63
"${NETDATA_INSTALL_PATH}/bin/srv/netdata" || exit 1
64
65
cat >"${NETDATA_INSTALL_PATH}/bin/netdata" <<EOF
@@ -67,28 +67,34 @@ cat >"${NETDATA_INSTALL_PATH}/bin/netdata" <<EOF
67
export PATH="${NETDATA_INSTALL_PATH}/bin:\${PATH}"
68
exec "${NETDATA_INSTALL_PATH}/bin/srv/netdata" "\${@}"
69
EOF
70
-chmod 755 "${NETDATA_INSTALL_PATH}/bin/netdata"
70
+run chmod 755 "${NETDATA_INSTALL_PATH}/bin/netdata"
71
72
73
# -----------------------------------------------------------------------------
74
# move etc to protect the destination when unpacked
75
76
-if [ -d "${NETDATA_INSTALL_PATH}/etc" ]
76
+if [ ! -z "${NETDATA_INSTALL_PATH}" -a -d "${NETDATA_INSTALL_PATH}/etc" ]
77
then
78
if [ -d "${NETDATA_INSTALL_PATH}/etc.new" ]
79
then
80
- rm -rf "${NETDATA_INSTALL_PATH}/etc.new" || exit 1
80
+ run rm -rf "${NETDATA_INSTALL_PATH}/etc.new" || exit 1
81
fi
82
83
- mv "${NETDATA_INSTALL_PATH}/etc" \
83
+ run mv "${NETDATA_INSTALL_PATH}/etc" \
84
"${NETDATA_INSTALL_PATH}/etc.new" || exit 1
85
+
86
+ if [ -f "${NETDATA_INSTALL_PATH}/etc.new/netdata/netdata.conf" ]
87
+ then
88
+ # delete the generated netdata.conf, so that the static installer will generate a new one
89
+ run rm "${NETDATA_INSTALL_PATH}/etc.new/netdata/netdata.conf"
90
+ fi
91
fi
92
93
94
# -----------------------------------------------------------------------------
95
# remove the links to allow untaring the archive
96
91
-rm "${NETDATA_INSTALL_PATH}/sbin" \
97
+run rm "${NETDATA_INSTALL_PATH}/sbin" \
98
"${NETDATA_INSTALL_PATH}/usr/bin" \
99
"${NETDATA_INSTALL_PATH}/usr/sbin" \
100
"${NETDATA_INSTALL_PATH}/usr/local"
@@ -100,7 +106,7 @@ rm "${NETDATA_INSTALL_PATH}/sbin" \
106
cat "${NETDATA_MAKESELF_PATH}/makeself.lsm" |\
107
sed "s|NETDATA_VERSION|${FILE_VERSION}|g" >"${NETDATA_MAKESELF_PATH}/makeself.lsm.tmp"
108
103
-"${NETDATA_MAKESELF_PATH}/makeself.sh" \
109
+run "${NETDATA_MAKESELF_PATH}/makeself.sh" \
110
--gzip \
111
--complevel 9 \
112
--notemp \
@@ -116,16 +122,16 @@ cat "${NETDATA_MAKESELF_PATH}/makeself.lsm" |\
122
./system/post-installer.sh \
123
${NULL}
124
119
-rm "${NETDATA_MAKESELF_PATH}/makeself.lsm.tmp"
125
+run rm "${NETDATA_MAKESELF_PATH}/makeself.lsm.tmp"
126
127
# -----------------------------------------------------------------------------
128
# copy it to the netdata build dir
129
130
FILE="netdata-${FILE_VERSION}.gz.run"
131
126
-cp "${NETDATA_INSTALL_PATH}.gz.run" "${FILE}"
132
+run cp "${NETDATA_INSTALL_PATH}.gz.run" "${FILE}"
133
echo >&2 "Self-extracting installer copied to '${FILE}'"
134
135
[ -f netdata-latest.gz.run ] && rm netdata-latest.gz.run
130
-ln -s "${FILE}" netdata-latest.gz.run
136
+run ln -s "${FILE}" netdata-latest.gz.run
137
echo >&2 "Self-extracting installer linked to 'netdata-latest.gz.run'"