support option --dont-start-it on static 64 bit installer; fixes https://github.com/firehol/binary-packages/issues/3
Costa Tsaousis (ktsaou) committed
Dec 25, 2017 at 20:25 UTC
45e0bc526ed896f236b208994edcacdfc5806c7e
2 files changed
+49
-11
kickstart-static64.sh
+19
-5
@@ -213,16 +213,30 @@ fi
213
# ---------------------------------------------------------------------------------------------------------------------
214
215
opts=
216
-if [ "${1}" = "--dont-wait" -o "${1}" = "--non-interactive" ]
217
-then
218
- opts="--accept"
219
-fi
216
+inner_opts=
217
+while [ ! -z "${1}" ]
218
+do
219
+ if [ "${1}" = "--dont-wait" -o "${1}" = "--non-interactive" ]
220
+ then
221
+ opts="${opts} --accept"
222
+ elif [ "${1}" = "--dont-start-it" ]
223
+ then
224
+ inner_opts="${inner_opts} ${1}"
225
+ else
226
+ echo >&2 "Unknown option '${1}'"
227
+ exit 1
228
+ fi
229
+ shift
230
+done
231
+[ ! -z "${inner_opts}" ] && inner_opts="-- ${inner_opts}"
232
+
233
+# ---------------------------------------------------------------------------------------------------------------------
234
235
progress "Installing netdata"
236
237
sudo=
238
[ "${UID}" != "0" ] && sudo="sudo"
225
-run ${sudo} sh "/tmp/${LATEST}" ${opts}
239
+run ${sudo} sh "/tmp/${LATEST}" ${opts} ${inner_opts}
240
241
if [ $? -eq 0 ]
242
then
makeself/install-or-update.sh
+30
-6
@@ -8,6 +8,21 @@ umask 002
8
# Be nice on production environments
9
renice 19 $$ >/dev/null 2>/dev/null
10
11
+# -----------------------------------------------------------------------------
12
+
13
+STARTIT=1
14
+
15
+while [ ! -z "${1}" ]
16
+do
17
+ if [ "${1}" = "--dont-start-it" ]
18
+ then
19
+ STARTIT=0
20
+ else
21
+ echo >&2 "Unknown option '${1}'. Ignoring it."
22
+ fi
23
+ shift
24
+done
25
+
26
27
# -----------------------------------------------------------------------------
28
progress "Checking new configuration files"
@@ -136,6 +151,7 @@ run chown -R ${NETDATA_USER}:${NETDATA_GROUP} /opt/netdata
151
152
153
# -----------------------------------------------------------------------------
154
+
155
progress "fix plugin permissions"
156
157
for x in apps.plugin freeipmi.plugin cgroup-network
@@ -156,14 +172,22 @@ then
172
run chmod 4750 bin/fping
173
fi
174
175
+
176
# -----------------------------------------------------------------------------
160
-progress "starting netdata"
177
162
-restart_netdata "/opt/netdata/bin/netdata"
163
-if [ $? -eq 0 ]
164
- then
165
- download_netdata_conf "${NETDATA_USER}:${NETDATA_GROUP}" "/opt/netdata/etc/netdata/netdata.conf" "http://localhost:19999/netdata.conf"
166
- netdata_banner "is installed and running now!"
178
+if [ ${STARTIT} -eq 1 ]
179
+then
180
+ progress "starting netdata"
181
+
182
+ restart_netdata "/opt/netdata/bin/netdata"
183
+ if [ $? -eq 0 ]
184
+ then
185
+ download_netdata_conf "${NETDATA_USER}:${NETDATA_GROUP}" "/opt/netdata/etc/netdata/netdata.conf" "http://localhost:19999/netdata.conf"
186
+ netdata_banner "is installed and running now!"
187
+ else
188
+ generate_netdata_conf "${NETDATA_USER}:${NETDATA_GROUP}" "/opt/netdata/etc/netdata/netdata.conf" "http://localhost:19999/netdata.conf"
189
+ netdata_banner "is installed now!"
190
+ fi
191
else
192
generate_netdata_conf "${NETDATA_USER}:${NETDATA_GROUP}" "/opt/netdata/etc/netdata/netdata.conf" "http://localhost:19999/netdata.conf"
193
netdata_banner "is installed now!"