copy all etc.new files to destination; enable iterative tty for docker
Costa Tsaousis (ktsaou) committed
Apr 2, 2017 at 12:37 UTC
ba23cb33394be26356fe6ac74579ed62b785a83a
4 files changed
+18
-12
makeself/build-x86_64-static.sh
+3
-1
@@ -28,7 +28,9 @@ then
28
fi
29
30
# Run the build script inside the container
31
-sudo docker run -v $(pwd):/usr/src/netdata.git:rw "${DOCKER_CONTAINER_NAME}" \
31
+sudo docker run -a stdin -a stdout -a stderr -i -t -v \
32
+ $(pwd):/usr/src/netdata.git:rw \
33
+ "${DOCKER_CONTAINER_NAME}" \
34
/bin/sh /usr/src/netdata.git/makeself/build.sh
35
36
if [ "${USER}" ]
makeself/build.sh
+1
-1
@@ -27,7 +27,7 @@ target Linux system cannot compile netdata.
27
28
EOF
29
30
-read -p "Press ENTER to continue > "
30
+# read -p "Press ENTER to continue > "
31
32
if [ ! -d tmp ]
33
then
makeself/install-or-update.sh
+8
-5
@@ -21,11 +21,11 @@ if [ ! -d etc/netdata ]
21
fi
22
23
md5sum="$(which md5sum 2>/dev/null || command -v md5sum 2>/dev/null || command -v md5 2>/dev/null)"
24
-for x in $(find etc/netdata.new -name '*.conf' -type f)
24
+for x in $(find etc.new -type f)
25
do
26
# find it relative filename
27
- f="${x/*etc\/netdata.new\//}"
28
- t="${x/*etc\/netdata.new\//etc\/netdata\/}"
27
+ f="${x/etc.new\//}"
28
+ t="${x/etc.new\//etc\/}"
29
d=$(dirname "${t}")
30
31
#echo >&2 "x: ${x}"
@@ -56,10 +56,13 @@ do
56
fi
57
fi
58
59
- run mv "${x}" "${t}.orig"
59
+ if ! [[ "${x}" =~ .*\.orig ]]
60
+ then
61
+ run mv "${x}" "${t}.orig"
62
+ fi
63
done
64
62
-run rm -rf etc/netdata.new
65
+run rm -rf etc.new
66
67
68
# -----------------------------------------------------------------------------
makeself/jobs/99-makeself.install.sh
+6
-5
@@ -41,15 +41,15 @@ chmod 755 "${NETDATA_INSTALL_PATH}/bin/netdata"
41
# -----------------------------------------------------------------------------
42
# move etc to protect the destination when unpacked
43
44
-if [ -d "${NETDATA_INSTALL_PATH}/etc/netdata" ]
44
+if [ -d "${NETDATA_INSTALL_PATH}/etc" ]
45
then
46
- if [ -d "${NETDATA_INSTALL_PATH}/etc/netdata.new" ]
46
+ if [ -d "${NETDATA_INSTALL_PATH}/etc.new" ]
47
then
48
- rm -rf "${NETDATA_INSTALL_PATH}/etc/netdata.new" || exit 1
48
+ rm -rf "${NETDATA_INSTALL_PATH}/etc.new" || exit 1
49
fi
50
51
- mv "${NETDATA_INSTALL_PATH}/etc/netdata" \
52
- "${NETDATA_INSTALL_PATH}/etc/netdata.new" || exit 1
51
+ mv "${NETDATA_INSTALL_PATH}/etc" \
52
+ "${NETDATA_INSTALL_PATH}/etc.new" || exit 1
53
fi
54
55
@@ -81,6 +81,7 @@ rm "${NETDATA_INSTALL_PATH}/sbin" \
81
./system/post-installer.sh \
82
${NULL}
83
84
+
85
# -----------------------------------------------------------------------------
86
# copy it to the netdata build dir
87
cp "${NETDATA_INSTALL_PATH}.gz.run" .