diff options
authorGravatar Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>2019-01-03 21:40:16 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-01-03 22:05:43 +0100
commit4d6e20ff46661d4f02fdd8595295f5496e8d64a8 (patch)
parent0d244183bfce0c5cf74f4897e57bb4b00b00bfa8 (diff)
support/download: fix scp downloads
scp download is broken, because scp is called without filename argument and only the server is specified. The call is: scp <server> <outputfile> but should be: scp <server>/<filename> <outputfile> Instead of assuming '-u' lists a full URL including filename (which it is not), align with the wget helper where -u is the server URL and -f gives the filename. With this commit, an scp download can work if FOO_SITE_METHOD is explicitly set to 'scp' and the server does not have a scheme prefix 'scp://'. The next commit will handle the case where a scheme prefix is present. Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> [Thomas: s/URL/URI/, as noticed by Yann.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
1 files changed, 4 insertions, 2 deletions
diff --git a/support/download/scp b/support/download/scp
index 8ecf2f4b22..49cfff2b9f 100755
--- a/support/download/scp
+++ b/support/download/scp
@@ -8,7 +8,8 @@ set -e
# Options:
# -q Be quiet.
# -o FILE Copy to local file FILE.
-# -u FILE Copy from remote file FILE.
+# -f FILE Copy from remote file FILE.
+# -u URI Download file at URI.
# Environment:
# SCP : the scp command to call
@@ -18,6 +19,7 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do
case "${OPT}" in
q) verbose=-q;;
o) output="${OPTARG}";;
+ f) filename="${OPTARG}";;
u) uri="${OPTARG}";;
:) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;;
\?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;;
@@ -32,4 +34,4 @@ _scp() {
eval ${SCP} "${@}"
-_scp ${verbose} "${@}" "'${uri}'" "'${output}'"
+_scp ${verbose} "${@}" "'${uri}/${filename}'" "'${output}'"