From 306c274239728a6307c06038e51f70ed904ba84b Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Tue, 28 Aug 2012 11:35:20 +1000 Subject: makepkg: always check makepkg.conf for match to download protocol The list of which download protocol should look in makepkg.conf for the download agent was hard coded into makepkg. Instead, fallback to checking the the download agents array for any non-local or (implemented) vcs source. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cad1f5ee..7e5aa959 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -284,7 +284,7 @@ get_downloadclient() { # if we didn't find an agent, return an error if [[ -z $agent ]]; then - error "$(gettext "There is no agent set up to handle %s URLs. Check %s.")" "$proto" "$MAKEPKG_CONF" + error "$(gettext "Unknown download protocol: %s")" "$proto" plain "$(gettext "Aborting...")" exit 1 # $E_CONFIG_ERROR fi @@ -596,9 +596,6 @@ download_sources() { local) download_local "$netfile" ;; - ftp|http|https|rsync|scp) - download_file "$netfile" - ;; git*) (( GET_VCS )) && download_git "$netfile" ;; @@ -609,9 +606,7 @@ download_sources() { (( GET_VCS )) && download_svn "$netfile" ;; *) - error "$(gettext "Unknown download protocol: %s")" "$proto" - plain "$(gettext "Aborting...")" - exit 1 + download_file "$netfile" ;; esac done -- cgit v1.2.3-70-g09d2