b70ce56651
Commit 54d3d94b6e ("support/download: print
command used for download") broke the git and svn download helpers, because
these helpers have invocations of the _git/_svn commands where the exact
output matters.
For example for git, this would result in:
date: invalid date ‘GIT_DIR=.../dl/libyuv/git/.git git log -1 --pretty=format:%ci \n2019-04-12 17:48:45 +0000’
Detected a corrupted git cache.
Removing it and starting afresh.
Fix by splitting the _git function in two: _git and _plain_git.
The former echoes the command, and then calls the latter.
Most invocations use _git as before, but those cases where the output should
not be disturbed, directly call _plain_git.
For symmetry, all download helpers are aligned, even though only the git and
svn helpers were broken.
Fixes: #13631
Fixes:
http://autobuild.buildroot.org/results/c2f/c2fcd4aa6660e3c2f9c6f85646ca7dfe0db56040/
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
[yann.morin.1998@free.fr: add bug report and autobuild failure]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
50 lines
1.4 KiB
Bash
Executable File
50 lines
1.4 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
# We want to catch any unexpected failure, and exit immediately
|
|
set -e
|
|
|
|
# Download helper for cp, to be called from the download wrapper script
|
|
#
|
|
# Options:
|
|
# -q Be quiet.
|
|
# -o FILE Copy to file FILE.
|
|
# -f FILE Copy from basename file FILE.
|
|
# -u DIR Copy from FILE in DIR.
|
|
#
|
|
# Environment:
|
|
# LOCALFILES: the cp command to call
|
|
|
|
# 'cp' usually does not print anything on its stdout, whereas the
|
|
# other download backends, even if not verbose, at least print some
|
|
# progress information.
|
|
# Make 'cp' verbose by default, so it behaves a bit like the others.
|
|
verbose=-v
|
|
|
|
while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do
|
|
case "${OPT}" in
|
|
q) verbose=;;
|
|
o) output="${OPTARG}";;
|
|
f) file="${OPTARG}";;
|
|
u) dir="${OPTARG}";;
|
|
:) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;;
|
|
\?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;;
|
|
esac
|
|
done
|
|
|
|
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
|
|
_plain_localfiles "$@"
|
|
}
|
|
# Note: please keep command below aligned with what is printed above
|
|
_plain_localfiles() {
|
|
eval ${LOCALFILES} "${@}"
|
|
}
|
|
|
|
_localfiles ${verbose} "'${dir##file://}/${file}'" "'${output}'"
|