From patchwork Wed Feb 12 19:10:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3844 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 526063F15A for ; Wed, 12 Feb 2025 20:10:29 +0100 (CET) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-5de572c8fd7sf3317a12.2 for ; Wed, 12 Feb 2025 11:10:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1739387429; cv=pass; d=google.com; s=arc-20240605; b=AJTD5/tM42HUdO5oKzujLLU/gkvMLg/7B0tpr1miY7QbXP/aj8Zs28yGYl1WrpUHZZ XSFcbWCHpSn7AWR2NqZTBvomnRjUOYlV+QT5/kf3PrsX4kEpXXpuiquH2KfoO4WyQKRZ sZvD6yT+IS1YrLpfm0L5hCphbKtqMvvOCWfjU84DYNiRqw1UzEQVXlSihYI0G8fZiZZ/ vZh0bzIRBvMNDiHowFouOadyzb5w+z/RXd1YHMvfYWhix5e23lx7OuKHdcAGCYCXFlIT 0IsWNvK0ta4XtgwjWb6EVLQGWlBXB6dBwtQ1P8VRBlK9LYNo9cXabDZ9XWVsy0npHWxU 3ZJQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=Z2ddX8olt8bAbVY3ij7JaiPmjgd9V4bZt6C0XAwzeyA=; fh=d+NXyq/HMKZ2vL2pWz97i/dhopxrBnNcPfw+U2evbQI=; b=KhSFGS4tAZWzKG+8j6g74Y9nxSEmo27+mA3mDDWSi+YY8EuvS9ISv5PvVMKSUeck+k 8JFwX+KarWejIjZn9NAI1fWcKMoRnYidf8TQEWfpTlYj57pTMWVIRTGP2xvJrD2BFRrt zSfSrItLeUz9lpa2t4yKCJ/QuemORYL3AzKXvfzROVQ8KPcRlRn0pQej8nW18SuuKiub Vl7ueeOMotEctXYHmPW/O8COREEH70nSmwEGHJwcLTUfelhij2E86MmXVN4MLkyN8xlk /CEKWSVzHxAfcbiKFipO83j+1HIM6KbQdoQI1Vk2eVZaaEV4Sw/zACjAPehOdlIOm1ZT Y/nA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UIlzN3wm; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1739387429; x=1739992229; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=Z2ddX8olt8bAbVY3ij7JaiPmjgd9V4bZt6C0XAwzeyA=; b=g18WG0SUmWk2o74nQpVyashYKH6tzdWa1El/z1wrxuG8U4c+6eYxradM8ic7x62fzx YHMBVLosZREeYvlGm5Pa+9KY0+iP6HyxJdcxwBQMht+9z6BFkDYzvYq1nVCHhjPN4+7V VzuXyJlKwEXY7HRElM7PtRNAX39SCorKiwZYg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739387429; x=1739992229; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Z2ddX8olt8bAbVY3ij7JaiPmjgd9V4bZt6C0XAwzeyA=; b=HTFABVLZ93t369RxM77x84Lg4ZWPKaPp70baN/9ex+YEmmA5L5US28Y5BG86yN/sgS oxKNw0OJyoxTS9rvFK5K0UZTqmmdn9E4n/CJKs+KqWMbJ8B98L+DJEjJigWjzJDnsmmu Bz3xXEZ8RdK8OnhppEj06OHGgQ8eZlIkb14Uv2VXHWyAhhOl7oMGvZ49xxWXys6hquzv aty6SbbMMqNZxwbPreG76ZjWS/2rxpkmy4I79nmTMZbLSxy7zLyKNwgI+IaAqFCdJDsx XuhV1lkFDv0CQEH9C1ghgo57pVsY8oJ8gu4yZVgaU0+lR3pyQVOVYXBdLg0LPyj+xpv8 h2KQ== X-Forwarded-Encrypted: i=2; AJvYcCXYUkKYHketsv0xb3mxAHIEVBVAq25eQcoz+K9T4zJQma8lR4D4UJDFqiyBTdNr8JaZasJp0ttkpHKwl3cf@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Yy+TNhp/yQ2yUc4YbWTKSYMELXS2MXDhaH3KsZmUhcP+HzWqMQT uFfEkHgNeN1MtbD3GkR/TFmnJOkKo5OA2q/aNfsce0rTMOmqqC83qk4AxGfuDRA+YQ== X-Google-Smtp-Source: AGHT+IEUb8SjFZ3odFkJR+vJRTKLqCpHx0jFQtg/g9JC0w1UM1Bm1k80FtRpImQ0dDn2tVUENGbwdQ== X-Received: by 2002:a05:6402:268e:b0:5dc:5e37:b3ab with SMTP id 4fb4d7f45d1cf-5deadd8c3e9mr4048405a12.12.1739387428464; Wed, 12 Feb 2025 11:10:28 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com; h=Adn5yVETGgrTMX/NaWUhDjrya+zrJ/ufng8jbkIEBG65zncV+A== Received: by 2002:a05:6402:1611:b0:5d3:db71:e5ea with SMTP id 4fb4d7f45d1cf-5dec9928065ls125934a12.2.-pod-prod-09-eu; Wed, 12 Feb 2025 11:10:27 -0800 (PST) X-Received: by 2002:a17:907:7f1f:b0:ab7:be81:8944 with SMTP id a640c23a62f3a-ab7f33459bdmr392138866b.6.1739387426560; Wed, 12 Feb 2025 11:10:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739387426; cv=none; d=google.com; s=arc-20240605; b=DDQEVZ+ZodASNsdJhW+Drt3Os3e/mazla5a1JKN+V+McKM9xuxHZoJGlktQtSd6BNg OHsLewSK4BzjnoD2QL6PL2OdwQSsCTEFt0UVDBc7/jmV7GdF9nOQD+2F4nEXSPnWfAPo WVvgqALXO+BiSAz7RUDNdG+2ZU2zt2pjYZpxOSlaSax1Pr3GCpLrQ5ZuJKXKkj0ITjQV k13yH+nifhFUzX5qJXJFGap95AD9SfaLEh1Ju3z2tZzmmSEJ74393zc4SBrPGqc+XzN/ 6w5yyAUTTUZ+U6IvM6izcIZiR2FDzqKwfrNRSKv6TwCqc7op0hOhMmF8PjGBHflHFnrE V++A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=VnjypLKpZpIBrqXeBOsIp3BQFHSXCKQYIyP3nLm43zs=; fh=gqsJDmjwnXqgG3M1Eb4ECOPlkFzBF3vSVyxLyDxybkA=; b=YIx4df5zr8/I+1Z4njxyfFwl+Fx2pmVhMqGXAM/pGKCxKHU1MYel5OX934DOHiBs6p VyTpJeK685Mf5ygSkN4iVuM+MyLPSUiuLT0mLeLu2nHrnzGsffsAHK521gISjGJOXrtl o6ZFCqk4S7gaj10D958Pm9oyIFKw2zYrd2S//YqXQ7GX45QtqNanVcd9FB6cZE3PZBc0 /ht1FV6KF8BMkWIxeBpIGxjJUyRPq89KWuH5p7NqPjWvI0THhjBaj8kp/2wcNdCzae3M RXLYJThNVMj9nzXEVivaVQ3VKDLKgbP1/rfe1bjUg82hHcQ1/sqye9vhKRsVvoqYYmHU NWnw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UIlzN3wm; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-ab7d1de0011sor328086566b.14.2025.02.12.11.10.26 for (Google Transport Security); Wed, 12 Feb 2025 11:10:26 -0800 (PST) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Gm-Gg: ASbGncvdxun898ZFdLDswXXh+1zbl6xJ6uftLbhgiEmN3mqSr1aAqpOymVVYDu1K0Tf byDxIUB3D6IYzvEKSrLdF35EMUjI9ek9znd2DQggx0UE7Y/i6jbhVkQjYhkN/LbROTXLay4Go/b Lk0oISfs0znGIoVALzvkH3/cpOHWkK6xj31h1g/1oWlDvdTMbCP7GqwTyHtcfCJpNBKUPKMD+b4 YcVFMIaatT0aBhIvctq7X+n7/7LkUEPIGWA4dJccx9unliQZqxKY6DlskHG7ZfBxJFvVJ5CY9NT bqXA+mRSpLLTZUAJodeqLvMWKrFGzo73zuu4zEvSoEiQv/yFhtXRt0ftMrG3fljtaJvDGcPgEsA y350D9PUvrw== X-Received: by 2002:a17:907:2d8b:b0:ab7:f2da:8127 with SMTP id a640c23a62f3a-ab7f347397dmr422797166b.36.1739387425910; Wed, 12 Feb 2025 11:10:25 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([176.200.206.123]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab7e4936eccsm361634366b.101.2025.02.12.11.10.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 11:10:24 -0800 (PST) From: Dario Binacchi To: buildroot@buildroot.org Cc: linux-amarula@amarulasolutions.com, Niklas Cassel , Dario Binacchi , Julien Olivain , Peter Korsgaard Subject: [RFC PATCH 1/1] package/pkg-download: don't export the download command variables Date: Wed, 12 Feb 2025 20:10:15 +0100 Message-ID: <20250212191015.3413693-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UIlzN3wm; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Exporting the download variables can cause unfortunate name clashes, as occurred with the SCP variable used by Binman for compiling U-Boot [1]. The patch removes the global export of the variables containing the commands used for downloading the packages and passes them as parameters, using the new -C option, to the dl-wrapper, which in turn passes the appropriate download command to the specific script under the support/download directory. [1] https://lore.kernel.org/buildroot/a023971c7c8bfa4826a9a8721500c7ff@free.fr/T/ Cc: Julien Olivain Suggested-by: Peter Korsgaard Signed-off-by: Dario Binacchi --- package/pkg-download.mk | 27 ++++++++++++++++++--------- support/download/bzr | 5 ++--- support/download/curl | 5 ++--- support/download/cvs | 5 ++--- support/download/dl-wrapper | 27 +++++++++++++++++++++++---- support/download/git | 5 ++--- support/download/hg | 5 ++--- support/download/scp | 5 ++--- support/download/sftp | 5 ++--- support/download/svn | 5 ++--- support/download/wget | 5 ++--- 11 files changed, 59 insertions(+), 40 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index ca01ff67a59e..580cc01cf882 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -8,15 +8,15 @@ ################################################################################ # Download method commands -export CURL := $(call qstrip,$(BR2_CURL)) -export WGET := $(call qstrip,$(BR2_WGET)) -export SVN := $(call qstrip,$(BR2_SVN)) -export CVS := $(call qstrip,$(BR2_CVS)) -export BZR := $(call qstrip,$(BR2_BZR)) -export GIT := $(call qstrip,$(BR2_GIT)) -export HG := $(call qstrip,$(BR2_HG)) -export SCP := $(call qstrip,$(BR2_SCP)) -export SFTP := $(call qstrip,$(BR2_SFTP)) +CURL := $(call qstrip,$(BR2_CURL)) +WGET := $(call qstrip,$(BR2_WGET)) +SVN := $(call qstrip,$(BR2_SVN)) +CVS := $(call qstrip,$(BR2_CVS)) +BZR := $(call qstrip,$(BR2_BZR)) +GIT := $(call qstrip,$(BR2_GIT)) +HG := $(call qstrip,$(BR2_HG)) +SCP := $(call qstrip,$(BR2_SCP)) +SFTP := $(call qstrip,$(BR2_SFTP)) export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) # Version of the format of the archives we generate in the corresponding @@ -132,6 +132,15 @@ define DOWNLOAD $(if $($(PKG)_GIT_SUBMODULES),-r) \ $(if $($(PKG)_GIT_LFS),-l) \ $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(PKG)),-u $(uri)) \ + -C '$(CURL)' \ + -C '$(WGET)' \ + -C '$(SVN)' \ + -C '$(CVS)' \ + -C '$(BZR)' \ + -C '$(GIT)' \ + -C '$(HG)' \ + -C '$(SCP)' \ + -C '$(SFTP)' \ $(2) \ $(QUIET) \ -- \ diff --git a/support/download/bzr b/support/download/bzr index 6f77bc286efb..2472e30ff3ab 100755 --- a/support/download/bzr +++ b/support/download/bzr @@ -11,9 +11,7 @@ set -e # -u URI Clone from repository at URI. # -c CSET Use changeset (or revision) CSET. # -n NAME Use basename NAME. -# -# Environment: -# BZR : the bzr command to call +# -C The bzr command to call. quiet= @@ -24,6 +22,7 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do u) uri="${OPTARG}";; c) cset="${OPTARG}";; n) basename="${OPTARG}";; + C) BZR="${OPTARG}";; :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac diff --git a/support/download/curl b/support/download/curl index 2124fe7cad95..65e2f976f790 100755 --- a/support/download/curl +++ b/support/download/curl @@ -10,9 +10,7 @@ set -e # -o FILE Save into file FILE. # -f FILENAME The filename of the tarball to get at URL # -u URL Download file at URL. -# -# Environment: -# CURL : the curl command to call +# -C The curl command to call. quiet= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do @@ -21,6 +19,7 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do o) output="${OPTARG}";; f) filename="${OPTARG}";; u) url="${OPTARG}";; + C) CURL="${OPTARG}";; :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac diff --git a/support/download/cvs b/support/download/cvs index a52e543e44c2..4e6ab8138997 100755 --- a/support/download/cvs +++ b/support/download/cvs @@ -12,9 +12,7 @@ set -e # -c REV Use revision REV. # -N RAWNAME Use rawname (aka module name) RAWNAME. # -n NAME Use basename NAME. -# -# Environment: -# CVS : the cvs command to call +# -C The cvs command to call. quiet= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do @@ -25,6 +23,7 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do c) rev="${OPTARG}";; N) rawname="${OPTARG}";; n) basename="${OPTARG}";; + C) CVS="${OPTARG}";; :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 5445aad5a76a..f63d14ebf65a 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -20,17 +20,34 @@ set -e # shellcheck source=helpers source-path=SCRIPTDIR . "${0%/*}/helpers" -export BR_BACKEND_DL_GETOPTS=":hc:d:o:n:N:H:lru:qf:e" +export BR_BACKEND_DL_GETOPTS=":hc:d:o:n:C:N:H:lru:qf:e" + +dl_cmd() { + local match_cmd="$1" + shift + local cmds=("$@") + + for cmd in "${cmds[@]}"; do + _cmd=$(echo "$cmd" | awk '{print $1}') + if [[ "$_cmd" == "$match_cmd" ]]; then + echo "$cmd" + return 0 + fi + done + + return 1 +} main() { local OPT OPTARG - local backend output large_file recurse quiet rc - local -a uris hfiles backend_opts post_process_opts + local backend backend_dl_cmd output large_file recurse quiet rc + local -a uris hfiles backend_opts post_process_opts dl_cmds # Parse our options; anything after '--' is for the backend - while getopts ":c:d:D:o:n:N:H:lrf:u:qp:P:" OPT; do + while getopts ":c:d:D:o:n:C:N:H:lrf:u:qp:P:" OPT; do case "${OPT}" in c) cset="${OPTARG}";; + C) dl_cmds+=( "${OPTARG}" );; d) dl_dir="${OPTARG}";; D) old_dl_dir="${OPTARG}";; o) output="${OPTARG}";; @@ -101,6 +118,7 @@ main() { esac uri=${uri#*+} + backend_dl_cmd=$(dl_cmd "${backend}" "${dl_cmds[@]}") urlencode=${backend_urlencode#*|} # urlencode must be "urlencode" [ "${urlencode}" != "urlencode" ] && urlencode="" @@ -134,6 +152,7 @@ main() { # cleanup and exit. if ! "${OLDPWD}/support/download/${backend}" \ -c "${cset}" \ + -C "${backend_dl_cmd}" \ -d "${dl_dir}" \ -n "${raw_base_name}" \ -N "${base_name}" \ diff --git a/support/download/git b/support/download/git index 8123bc31531c..59e12cba8855 100755 --- a/support/download/git +++ b/support/download/git @@ -17,9 +17,7 @@ set -e # -u URI Clone from repository at URI. # -c CSET Use changeset CSET. # -n NAME Use basename NAME. -# -# Environment: -# GIT : the git command to call +# -C The git command to call. # shellcheck disable=SC1090 # Only provides mk_tar_gz() # shellcheck disable=SC1091 @@ -65,6 +63,7 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do c) cset="${OPTARG}";; d) dl_dir="${OPTARG}";; n) basename="${OPTARG}";; + C) GIT="${OPTARG}";; :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac diff --git a/support/download/hg b/support/download/hg index 768a27e06fd0..bc133ac2c2ff 100755 --- a/support/download/hg +++ b/support/download/hg @@ -11,9 +11,7 @@ set -e # -u URI Clone from repository at URI. # -c CSET Use changeset (or revision) CSET. # -n NAME Use basename NAME. -# -# Environment: -# HG : the hg command to call +# -C The hg command to call. quiet= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do @@ -23,6 +21,7 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do u) uri="${OPTARG}";; c) cset="${OPTARG}";; n) basename="${OPTARG}";; + C) HG="${OPTARG}";; :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac diff --git a/support/download/scp b/support/download/scp index 14e768b601d0..ac88ea9e6285 100755 --- a/support/download/scp +++ b/support/download/scp @@ -10,9 +10,7 @@ set -e # -o FILE Copy to local file FILE. # -f FILE Copy from remote file FILE. # -u URI Download file at URI. -# -# Environment: -# SCP : the scp command to call +# -C The scp command to call. quiet= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do @@ -21,6 +19,7 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do o) output="${OPTARG}";; f) filename="${OPTARG}";; u) uri="${OPTARG}";; + C) SCP="${OPTARG}";; :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac diff --git a/support/download/sftp b/support/download/sftp index 0a44be7e618f..3bddc115fc64 100755 --- a/support/download/sftp +++ b/support/download/sftp @@ -10,9 +10,7 @@ set -e # -o FILE Copy to local file FILE. # -f FILE Copy from remote file FILE. # -u URI Download file at URI. -# -# Environment: -# SFTP : the sftp command to call +# -C The sftp command to call. quiet= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do @@ -21,6 +19,7 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do o) output="${OPTARG}";; f) filename="${OPTARG}";; u) uri="${OPTARG}";; + C) SFTP="${OPTARG}";; :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac diff --git a/support/download/svn b/support/download/svn index ff33f1fa39af..829e6bb6f226 100755 --- a/support/download/svn +++ b/support/download/svn @@ -17,9 +17,7 @@ set -e # -c REV Use revision REV. # -n NAME Use basename NAME. # -r Recursive, i.e. use externals -# -# Environment: -# SVN : the svn command to call +# -C The svn command to call. # shellcheck disable=SC1090 # Only provides mk_tar_gz() # shellcheck disable=SC1091 @@ -35,6 +33,7 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do c) rev="${OPTARG}";; n) basename="${OPTARG}";; r) externals=;; + C) SVN="${OPTARG}";; :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac diff --git a/support/download/wget b/support/download/wget index 68bd0b13c870..be10e123410f 100755 --- a/support/download/wget +++ b/support/download/wget @@ -11,9 +11,7 @@ set -e # -f FILENAME The filename of the tarball to get at URL # -u URL Download file at URL. # -e ENCODE Tell wget to urlencode the filename passed to it -# -# Environment: -# WGET : the wget command to call +# -C The wget command to call. quiet= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do @@ -23,6 +21,7 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do f) filename="${OPTARG}";; u) url="${OPTARG}";; e) encode="-e";; + C) WGET="${OPTARG}";; :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac