Commit 5b3880e1 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

support/download: convert scp to use the wrapper 



This drastically simplifies the scp helper, as it no longer has to deal
with atomically saving the downloaded archive.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
(Tested by setting a primary site to 'scp://localhost:/tmp

' and
running 'make vim-source')
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 93e678b7

package/pkg-download.mk

+3 −2
Original line number Diff line number Diff line
@@ -168,8 +168,9 @@ endef 
# to prepend the path with a slash: scp://[user@]host:/absolutepath

define DOWNLOAD_SCP

	test -e $(DL_DIR)/$(2) || \

	$(EXTRA_ENV) support/download/scp '$(call stripurischeme,$(call qstrip,$(1)))' \

					  $(DL_DIR)/$(2) && \

	$(EXTRA_ENV) support/download/wrapper scp \

		$(DL_DIR)/$(2) \

		'$(call stripurischeme,$(call qstrip,$(1)))' && \

	$(call VERIFY_HASH,$(PKGDIR)/$($(PKG)_NAME).hash,$(DL_DIR)/$(2))

endef

support/download/scp

+8 −20
Original line number Diff line number Diff line 
#!/bin/bash



# We want to catch any command failure, and exit immediately

# We want to catch any unexpected failure, and exit immediately

set -e



# Download helper for scp

# Call it with:

#   $1: URL

#   $2: output file

# Download helper for scp, to be called from the download wrapper script

# Expected arguments:

#   $1: output file

#   $2: URL

# And this environment:

#   SCP       : the scp command to call



url="${1}"

output="${2}"

tmp_dl="$( mktemp "${BUILD_DIR}/.XXXXXX" )"

tmp_output="$( mktemp "${output}.XXXXXX" )"

output="${1}"

url="${2}"



ret=1

if ${SCP} "${url}" "${tmp_dl}"; then

    if mv "${tmp_dl}" "${tmp_output}"; then

        mv "${tmp_output}" "${output}"

        ret=0

    fi

fi



# Cleanup

rm -f "${tmp_dl}" "${tmp_output}"

exit ${ret}
 
${SCP} "${url}" "${output}"