diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-04-19 16:58:21 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-04-19 16:58:21 (GMT) |
| commit | 9643bcbb5562b9c343add3b8f182263656c32687 (patch) | |
| tree | 2b35c6b7b2c13b463bd3693b066cfc656be7b1e3 /scripts/functions | |
| parent | 2c4722fe111f9559dcfd0395ab38676d1baecd61 (diff) | |
Simplify the mirror settings.
-------- diffstat follows --------
/trunk/scripts/functions | 7 3 4 0 ++---
/trunk/config/global/download.in | 60 14 46 0 +++++++++++-----------------------------------
2 files changed, 17 insertions(+), 50 deletions(-)
Diffstat (limited to 'scripts/functions')
| -rw-r--r-- | scripts/functions | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/functions b/scripts/functions index 756f77d..44c9468 100644 --- a/scripts/functions +++ b/scripts/functions @@ -409,10 +409,9 @@ CT_GetFile() { # Add URLs on the LAN mirror LAN_URLS= if [ "${CT_USE_MIRROR}" = "y" ]; then - CT_TestOrAbort "Please set the LAN mirror hostname" -n "${CT_MIRROR_HOSTNAME}" - CT_TestOrAbort "Please tell me where to find tarballs on the LAN mirror '${CT_MIRROR_HOSTNAME}'" -n "${CT_MIRROR_BASE}" - LAN_URLS="${LAN_URLS} ${CT_MIRROR_SCHEME}://${CT_MIRROR_HOSTNAME}/${CT_MIRROR_BASE}/${file%-*}" - LAN_URLS="${LAN_URLS} ${CT_MIRROR_SCHEME}://${CT_MIRROR_HOSTNAME}/${CT_MIRROR_BASE}" + CT_TestOrAbort "Please set the mirror base URL" -n "${CT_MIRROR_BASE_URL}" + LAN_URLS="${LAN_URLS} ${CT_MIRROR_BASE_URL}/${file%-*}" + LAN_URLS="${LAN_URLS} ${CT_MIRROR_BASE_URL}" if [ "${CT_PREFER_MIRROR}" = "y" ]; then CT_DoLog DEBUG "Pre-pending LAN mirror URLs" |