From fd71d65c32c7a75161ec30adc04fb342f8a421d8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 8 Dec 2010 22:36:08 +0000 Subject: [PATCH] - use http as default for distfiles access (why are we using ftp anyway, it's not faster or less resource consuming or more secure than http?) Changed files: builder.sh -> 1.640 --- builder.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/builder.sh b/builder.sh index c845f7e..34c0feb 100644 --- a/builder.sh +++ b/builder.sh @@ -105,7 +105,7 @@ PACKAGE_RELEASE="" PACKAGE_VERSION="" PACKAGE_NAME="" ASSUMED_NAME="" -PROTOCOL="ftp" +PROTOCOL="http" WGET_RETRIES=${MAX_WGET_RETRIES:-0} CVS_COMMAND=${CVS_COMMAND:-cvs} @@ -255,7 +255,7 @@ usage() { Usage: builder [-D|--debug] [-V|--version] [--short-version] [--as_anon] [-a|--add_cvs] [-b|-ba|--build] [-bb|--build-binary] [-bs|--build-source] [-bc] [-bi] [-bl] [-u|--try-upgrade] [{-cf|--cvs-force}] [{-B|--branch} ] [{-d|--cvsroot} ] -[-g|--get] [-h|--help] [--http] [{-l|--logtofile} ] [-m|--mr-proper] +[-g|--get] [-h|--help] [--ftp] [--http] [{-l|--logtofile} ] [-m|--mr-proper] [-q|--quiet] [--date [-r ] [{-T|--tag ] [-Tvs|--tag-version-stable] [-Ts|--tag-stable] [-Tv|--tag-version] [{-Tp|--tag-prefix} ] [{-tt|--test-tag}] [--use-greed-sources] @@ -301,7 +301,7 @@ Usage: builder [-D|--debug] [-V|--version] [--short-version] [--as_anon] [-a|--a or HTTP/FTP, -h, --help - this message, -jN, -j N - set %_smp_mflags to propagate concurrent jobs ---http - use http instead of ftp, +--ftp, --http - use ftp or http protocol to access distfiles server -l , --logtofile - log all to file, -nc, --no-cvs - don't download sources from CVS, if source URL is given, @@ -2175,6 +2175,8 @@ while [ $# -gt 0 ]; do COMMAND="get"; shift ;; -h | --help ) COMMAND="usage"; shift ;; + --ftp ) + PROTOCOL="ftp"; shift ;; --http ) PROTOCOL="http"; shift ;; -j) -- 2.44.0