Fix curl download (#5439)
* gitignore rules for generated files matched packaging content * follow http redirects when downloading via curl (#5411)
Thomas Hufschmidt committed
Feb 20, 2019 at 11:50 UTC
97526940073733f2fcdcaf9f61e17dfbcb89ace0
5 files changed
+6
-6
.gitignore
+2
-2
@@ -112,7 +112,8 @@ collectors/fping.plugin/fping.plugin
112
collectors/go.d.plugin
113
114
# installer generated files
115
-netdata-uninstaller.sh
115
+/netdata-uninstaller.sh
116
+/netdata-updater.sh
117
118
# cmake files
119
cmake-build-debug/
@@ -164,5 +165,4 @@ docs/generator/src
165
docs/generator/build
166
docs/generator/mkdocs.yml
167
167
-netdata-updater.sh
168
.environment.sh
netdata-installer.sh
+1
-1
@@ -50,7 +50,7 @@ download() {
50
run wget --progress=dot:mega -O - "${url}" >"${dest}" || fatal "Cannot download ${url}"
51
fi
52
elif command -v curl >/dev/null 2>&1; then
53
- run curl "${url}" >"${dest}" || fatal "Cannot download ${url}"
53
+ run curl -L "${url}" >"${dest}" || fatal "Cannot download ${url}"
54
else
55
fatal "I need curl or wget to proceed, but neither is available on this system."
56
fi
packaging/installer/kickstart-static64.sh
+1
-1
@@ -86,7 +86,7 @@ download() {
86
if command -v wget >/dev/null 2>&1; then
87
run wget -O - "${url}" >"${dest}" || fatal "Cannot download ${url}"
88
elif command -v curl >/dev/null 2>&1; then
89
- run curl "${url}" >"${dest}" || fatal "Cannot download ${url}"
89
+ run curl -L "${url}" >"${dest}" || fatal "Cannot download ${url}"
90
else
91
fatal "I need curl or wget to proceed, but neither is available on this system."
92
fi
packaging/installer/kickstart.sh
+1
-1
@@ -118,7 +118,7 @@ download() {
118
if command -v wget >/dev/null 2>&1; then
119
run wget -O - "${url}" >"${dest}" || fatal "Cannot download ${url}"
120
elif command -v curl >/dev/null 2>&1; then
121
- run curl "${url}" >"${dest}" || fatal "Cannot download ${url}"
121
+ run curl -L "${url}" >"${dest}" || fatal "Cannot download ${url}"
122
else
123
fatal "I need curl or wget to proceed, but neither is available on this system."
124
fi
packaging/installer/netdata-updater.sh
+1
-1
@@ -37,7 +37,7 @@ download() {
37
if command -v wget >/dev/null 2>&1; then
38
wget -O - "${url}" >"${dest}" 2>&3 || echo >&2 "Cannot download ${url}" >&3 2>&3
39
elif command -v curl >/dev/null 2>&1; then
40
- curl "${url}" >"${dest}" 2>&3 || echo "Cannot download ${url}" >&3 2>&3
40
+ curl -L "${url}" >"${dest}" 2>&3 || echo "Cannot download ${url}" >&3 2>&3
41
else
42
failed "curl or wget is needed to proceed, but neither is available on this system."
43
fi