From 66564c2324abc58b24327b763e1113ff781156a2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 21 Feb 2019 20:34:01 +0100 Subject: Adding upstream version 1.12.1. Signed-off-by: Daniel Baumann --- packaging/installer/kickstart.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packaging/installer/kickstart.sh') diff --git a/packaging/installer/kickstart.sh b/packaging/installer/kickstart.sh index 2a5c874da..9a5e848ba 100755 --- a/packaging/installer/kickstart.sh +++ b/packaging/installer/kickstart.sh @@ -115,10 +115,10 @@ fatal() { download() { url="${1}" dest="${2}" - if command -v wget >/dev/null 2>&1; then - run wget -O - "${url}" >"${dest}" || fatal "Cannot download ${url}" - elif command -v curl >/dev/null 2>&1; then - run curl "${url}" >"${dest}" || fatal "Cannot download ${url}" + if command -v curl >/dev/null 2>&1; then + run curl -L --connect-timeout 5 --retry 3 "${url}" >"${dest}" || fatal "Cannot download ${url}" + elif command -v wget >/dev/null 2>&1; then + run wget -T 15 -O - "${url}" >"${dest}" || fatal "Cannot download ${url}" else fatal "I need curl or wget to proceed, but neither is available on this system." fi @@ -218,7 +218,7 @@ EOF # Check if tmp is mounted as noexec if grep -Eq '^[^ ]+ /tmp [^ ]+ ([^ ]*,)?noexec[, ]' /proc/mounts; then - pattern="/opt/netdata-kickstart-XXXXXX" + pattern="$(pwd)/netdata-kickstart-XXXXXX" else pattern="/tmp/netdata-kickstart-XXXXXX" fi -- cgit v1.2.3