support/download: print command used for download

Even though that most download commands actually print some output, like
progress indication or other messages, the actual command used is not. This
makes it hard to analyze a build log when you are not fully familiar with
the typical output of said log.

Update the download helpers to do just that, respecting any quiet/verbose
flag so that a silent make (make -s) does not get more verbose.

Note: getting rid of the duplication of the command in the script is not
straightforward without breaking support for arguments with spaces.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
[yann.morin.1998@free.fr: use printf, not echo]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

diff --git a/support/download/bzr b/support/download/bzr
index 7cc6890a301cd34efeccfeac834927142add0863..835f6ef564fb7e3999abdcc9838e75e3f41c0a1a 100755 (executable)
--- a/support/download/bzr
+++ b/support/download/bzr
@@ -34,6 +34,9 @@ shift $((OPTIND-1)) # Get rid of our options
 # Caller needs to single-quote its arguments to prevent them from
 # being expanded a second time (in case there are spaces in them)
 _bzr() {
+    if [ -z "${quiet}" ]; then
+        printf '%s ' ${BZR} "${@}"; printf '\n'
+    fi
     eval ${BZR} "${@}"
 }
 

diff --git a/support/download/cvs b/support/download/cvs
index 463d70c220d50126e9d67400c4fc933cc49320e4..ed034ade2d94597f7d73b26c784b061ab73db470 100755 (executable)
--- a/support/download/cvs
+++ b/support/download/cvs
@@ -39,6 +39,9 @@ shift $((OPTIND-1)) # Get rid of our options
 # ). Since nobody sane will put large code bases in CVS, a timeout of
 # 10 minutes should do the trick.
 _cvs() {
+    if [ -z "${quiet}" ]; then
+        printf '%s ' timeout 10m ${CVS} "${@}"; printf '\n'
+    fi
     eval timeout 10m ${CVS} "${@}"
 }
 

diff --git a/support/download/file b/support/download/file
index e52fcf2c8ca41afcb18bfb18057525ab4ce873d7..f2a638b1a829fd3704d2253042784d0149c3f2df 100755 (executable)
--- a/support/download/file
+++ b/support/download/file
@@ -36,6 +36,9 @@ shift $((OPTIND-1)) # Get rid of our options
 # Caller needs to single-quote its arguments to prevent them from
 # being expanded a second time (in case there are spaces in them)
 _localfiles() {
+    if [ -n "${verbose}" ]; then
+        printf '%s ' ${LOCALFILES} "${@}"; printf '\n'
+    fi
     eval ${LOCALFILES} "${@}"
 }
 

diff --git a/support/download/git b/support/download/git
index 01e0f214cf526a78ec7316d324c80d14ac5c6c86..336e1701269d1c585f8038c6176ec11841e95074 100755 (executable)
--- a/support/download/git
+++ b/support/download/git
@@ -79,6 +79,9 @@ trap _on_error ERR
 # Caller needs to single-quote its arguments to prevent them from
 # being expanded a second time (in case there are spaces in them)
 _git() {
+    if [ -z "${quiet}" ]; then
+        printf '%s ' GIT_DIR="${git_cache}/.git" ${GIT} "${@}"; printf '\n'
+    fi
     eval GIT_DIR="${git_cache}/.git" ${GIT} "${@}"
 }
 

diff --git a/support/download/hg b/support/download/hg
index c8149c9c9137cc20480acc7a32891d14f04f5976..add697d6ad79eb04def6b72b779da3b0d4d9f3d6 100755 (executable)
--- a/support/download/hg
+++ b/support/download/hg
@@ -33,6 +33,9 @@ shift $((OPTIND-1)) # Get rid of our options
 # Caller needs to single-quote its arguments to prevent them from
 # being expanded a second time (in case there are spaces in them)
 _hg() {
+    if [ -z "${quiet}" ]; then
+        printf '%s ' ${HG} "${@}"; printf '\n'
+    fi
     eval ${HG} "${@}"
 }
 

diff --git a/support/download/scp b/support/download/scp
index 636d66c66abfaae97f21f548ab2950229e3d0290..27dcb5550fd9d2327e421578f167fe672274121f 100755 (executable)
--- a/support/download/scp
+++ b/support/download/scp
@@ -31,6 +31,9 @@ shift $((OPTIND-1)) # Get rid of our options
 # Caller needs to single-quote its arguments to prevent them from
 # being expanded a second time (in case there are spaces in them)
 _scp() {
+    if [ -z "${quiet}" ]; then
+        printf '%s ' ${SCP} "${@}"; printf '\n'
+    fi
     eval ${SCP} "${@}"
 }
 

diff --git a/support/download/svn b/support/download/svn
index 395c92594f9305ce3763d8d5a837bd639e0589e9..e85ff6981f3d07bb85f317a70c82fea42c3167e9 100755 (executable)
--- a/support/download/svn
+++ b/support/download/svn
@@ -40,6 +40,9 @@ shift $((OPTIND-1)) # Get rid of our options
 # Caller needs to single-quote its arguments to prevent them from
 # being expanded a second time (in case there are spaces in them)
 _svn() {
+    if [ -z "${quiet}" ]; then
+        printf '%s ' ${SVN} "${@}"; printf '\n'
+    fi
     eval ${SVN} "${@}"
 }
 

diff --git a/support/download/wget b/support/download/wget
index 1bcb1e4b00487033757170ff18a3bf1ac207a7fe..383b1edd2606220f2d4c785aa811da33ebca61c7 100755 (executable)
--- a/support/download/wget
+++ b/support/download/wget
@@ -33,6 +33,9 @@ shift $((OPTIND-1)) # Get rid of our options
 # Caller needs to single-quote its arguments to prevent them from
 # being expanded a second time (in case there are spaces in them)
 _wget() {
+    if [ -z "${quiet}" ]; then
+        printf '%s ' ${WGET} "${@}"; printf '\n'
+    fi
     eval ${WGET} "${@}"
 }