absolute references to several paths
Costa Tsaousis (ktsaou) committed
Mar 27, 2017 at 01:05 UTC
856d016c8e0376f8f40bbd9d19f58e896e1f0b5a
3 files changed
+21
-10
makeself/build.sh
+1
-1
@@ -44,7 +44,7 @@ target Linux system cannot compile netdata.
44
45
EOF
46
47
-read "Press ENTER to continue > "
47
+read -p "Press ENTER to continue > "
48
49
if [ ! -d tmp ]
50
then
makeself/functions.sh
+15
-6
@@ -15,12 +15,21 @@ set -euo pipefail
15
# -----------------------------------------------------------------------------
16
17
fetch() {
18
- local dir="${1}" url="${2}"
19
- local tar="${dir}.tar.gz"
20
-
21
- [ ! -f "tmp/${tar}" ] && run wget -O "tmp/${tar}" "${url}"
22
- [ ! -d "tmp/${dir}" ] && cd tmp && run tar -zxvpf "${tar}"
23
- run cd "tmp/${dir}"
18
+ local dir="${1}" url="${2}"
19
+ local tar="${dir}.tar.gz"
20
+
21
+ if [ ! -f "${NETDATA_MAKESELF_PATH}/tmp/${tar}" ]
22
+ then
23
+ run wget -O "${NETDATA_MAKESELF_PATH}/tmp/${tar}" "${url}"
24
+ fi
25
+
26
+ if [ ! -d "${NETDATA_MAKESELF_PATH}/tmp/${dir}" ]
27
+ then
28
+ cd "${NETDATA_MAKESELF_PATH}/tmp"
29
+ run tar -zxvpf "${tar}"
30
+ fi
31
+
32
+ run cd "${NETDATA_MAKESELF_PATH}/tmp/${dir}"
33
}
34
35
# -----------------------------------------------------------------------------
makeself/run-all-jobs.sh
+5
-3
@@ -8,7 +8,7 @@ renice 19 $$ >/dev/null 2>/dev/null
8
9
# prepare the environment for the jobs
10
export NETDATA_INSTALL_PATH="${1-/opt/netdata}"
11
-export NETDATA_MAKESELF_PATH="$(pwd)"
11
+export NETDATA_MAKESELF_PATH="$(dirname "${0}")"
12
export NETDATA_SOURCE_PATH="${NETDATA_MAKESELF_PATH}/.."
13
14
PROCESSORS=$(cat /proc/cpuinfo 2>/dev/null | grep ^processor | wc -l)
@@ -18,9 +18,11 @@ export PROCESSORS
18
# make sure ${NULL} is empty
19
export NULL=
20
21
-. $(dirname "${0}")/functions.sh "${@}" || exit 1
21
+cd "${NETDATA_MAKESELF_PATH}" || exit 1
22
23
-for x in $(dirname "${0}")/*.install.sh
23
+. ./functions.sh "${@}" || exit 1
24
+
25
+for x in jobs/*.install.sh
26
do
27
progress "running ${x}"
28
"${x}" "${NETDATA_INSTALL_PATH}"