[asterisk-commits] build tools: Fix download externals to allow the use of cur... (asterisk[13])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Feb 23 08:33:58 CST 2017


Anonymous Coward #1000019 has submitted this change and it was merged. ( https://gerrit.asterisk.org/5068 )

Change subject: build_tools:  Fix download_externals to allow the use of curl or wget
......................................................................


build_tools:  Fix download_externals to allow the use of curl or wget

Not sure if this is really a bug versus an improvement. I can see it being
viewed as a bug though by some.

The current build_tools/download_externals file depends on wget in order to
download external modules.  The current build system is able to discover
which tool to use for fetching remote files - either wget or curl.

This patch takes advantage of this capability by modifying the two calls to
the wget binary to instead use what was discovered by the build system.

ASTERISK-26812 #close

Change-Id: If9411a2554f009274d377445613ae91192d948a1
---
M build_tools/download_externals
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  George Joseph: Looks good to me, approved
  Anonymous Coward #1000019: Verified
  Sean Bright: Looks good to me, but someone else must approve



diff --git a/build_tools/download_externals b/build_tools/download_externals
index d2e2e4f..b0a414e 100755
--- a/build_tools/download_externals
+++ b/build_tools/download_externals
@@ -103,7 +103,7 @@
 	echo ${v}
 }
 
-${WGET} -q -O ${tmpdir}/${variant_manifest} ${remote_url}/${variant_manifest} || {
+${DOWNLOAD_TO_STDOUT} ${remote_url}/${variant_manifest} > ${tmpdir}/${variant_manifest} || {
 	echo "${full_name}: Unable to fetch ${remote_url}/${variant_manifest}"
 	exit 1
 }
@@ -188,7 +188,7 @@
 
 if [[ ${need_download} = 1 ]] ; then
 	echo "${full_name}: Downloading ${remote_url}/${tarball}"
-	${WGET} -q -O ${cache_dir}/${tarball} ${remote_url}/${tarball} || {
+	${DOWNLOAD_TO_STDOUT} ${remote_url}/${tarball} > ${cache_dir}/${tarball} || {
 		echo "${full_name}: Unable to fetch ${remote_url}/${tarball}"
 		exit 1
 	}

-- 
To view, visit https://gerrit.asterisk.org/5068
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If9411a2554f009274d377445613ae91192d948a1
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Michael L. Young <elgueromexicano at gmail.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Michael L. Young <elgueromexicano at gmail.com>
Gerrit-Reviewer: Sean Bright <sean.bright at gmail.com>



More information about the asterisk-commits mailing list