Commit 50c8b7e9 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

support/download: support -q in all download backends 



Add an option flag to all backends, as well as the check-hash script, so
as to silence download helpers when the user wants a silent build.

Additionaly, make the default be verbose.

Inspired by Fabio's patch on git/svn.

[Thomas: fix a typo "Environemnt" -> "Environment"

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent a61b7476

support/download/bzr

+16 −7
Original line number Diff line number Diff line
@@ -4,17 +4,26 @@ 
set -e



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

# Expected arguments:

#   $1: output file

#   $2: bzr repo

#   $3: bzr revision

#   $4: basename

# And this environment:

#

# Call it as:

#   .../bzr [-q] OUT_FILE REPO_URL REV BASENAME

#

# Environment:

#   BZR      : the bzr command to call





verbose=-v

while getopts :q OPT; do

    case "${OPT}" in

    q)  verbose=-q;;

    \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;;

    esac

done

shift $((OPTIND-1))



output="${1}"

repo="${2}"

rev="${3}"

basename="${4}"



${BZR} export --root="${basename}/" --format=tgz "${output}" "${repo}" -r "${rev}"
 
${BZR} export ${verbose} --root="${basename}/" --format=tgz "${output}" "${repo}" -r "${rev}"

support/download/check-hash

+8 −0
Original line number Diff line number Diff line
@@ -10,6 +10,14 @@ set -e 
#       saved as, to be able to match it to the corresponding hashes

#       in the .hash file



while getopts :q OPT; do

    case "${OPT}" in

    q)  exec >/dev/null;;

    \?) exit 1;;

    esac

done

shift $((OPTIND-1))



h_file="${1}"

file="${2}"

base="${3}"

support/download/cp

+15 −5
Original line number Diff line number Diff line
@@ -4,13 +4,23 @@ 
set -e



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

# Expected arguments:

#   $1: output file

#   $2: source file

# And this environment:

#

# Call it as:

#   .../cp [-q] OUT_FILE SRC_FILE

#

# Environment:

#   LOCALFILES: the cp command to call



verbose=-v

while getopts :q OPT; do

    case "${OPT}" in

    q)  verbose=;;

    \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;;

    esac

done

shift $((OPTIND-1))



output="${1}"

source="${2}"



${LOCALFILES} "${source}" "${output}"
 
${LOCALFILES} ${verbose} "${source}" "${output}"

support/download/cvs

+15 −8
Original line number Diff line number Diff line
@@ -4,22 +4,29 @@ 
set -e



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

# Expected arguments:

#   $1: output file

#   $2: cvs repo

#   $3: cvs revision

#   $4: package's name (eg. foobar)

#   $5: package's basename (eg. foobar-1.2.3)

# And this environment:

#

# Call it as:

#   .../cvs [-q] OUT_FILE CVS_URL REV PKG_NAME BASENAME

#

# Environment:

#   CVS      : the cvs command to call



verbose=

while getopts :q OPT; do

    case "${OPT}" in

    q)  verbose=-Q;;

    \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;;

    esac

done

shift $((OPTIND-1))



output="${1}"

repo="${2}"

rev="${3}"

rawname="${4}"

basename="${5}"



${CVS} -z3 -d":pserver:anonymous@${repo}" \

${CVS} ${verbose} -z3 -d":pserver:anonymous@${repo}" \

       co -d "${basename}" -r ":${rev}" -P "${rawname}"



tar czf "${output}" "${basename}"

support/download/git

+16 −8
Original line number Diff line number Diff line
@@ -4,14 +4,22 @@ 
set -e



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

# Expected arguments:

#   $1: output file

#   $2: git repo

#   $3: git cset

#   $4: package's basename (eg. foobar-1.2.3)

# And this environment:

#

# Call it as:

#   .../git [-q] OUT_FILE REPO_URL CSET BASENAME

#

# Environment:

#   GIT      : the git command to call



verbose=-v

while getopts :q OPT; do

    case "${OPT}" in

    q)  verbose=-q;;

    \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;;

    esac

done

shift $((OPTIND-1))



output="${1}"

repo="${2}"

cset="${3}"
@@ -22,7 +30,7 @@ basename="${4}" 
git_done=0

if [ -n "$(${GIT} ls-remote "${repo}" "${cset}" 2>&1)" ]; then

    printf "Doing shallow clone\n"

    if ${GIT} clone --depth 1 -b "${cset}" --bare "${repo}" "${basename}"; then

    if ${GIT} clone ${verbose} --depth 1 -b "${cset}" --bare "${repo}" "${basename}"; then

        git_done=1

    else

        printf "Shallow clone failed, falling back to doing a full clone\n"
@@ -30,7 +38,7 @@ if [ -n "$(${GIT} ls-remote "${repo}" "${cset}" 2>&1)" ]; then 
fi

if [ ${git_done} -eq 0 ]; then

    printf "Doing full clone\n"

    ${GIT} clone --bare "${repo}" "${basename}"

    ${GIT} clone ${verbose} --bare "${repo}" "${basename}"

fi



GIT_DIR="${basename}" \