Add a `distfiles' option for makepkg

Question

Inspired by Gentoo distfiles in Gentoo mirrors, I've added a `distfiles' option in makepkg, so that makepkg can download source files from Gentoo mirrors if possible. This is good for some users who have limitations in their network to help them download source files faster and easier from mirrors.
However, my patch is very simple and therefore very buggy, just as follows.
diff -rupN orig/makepkg mod/makepkg
--- orig/makepkg 2013-07-20 09:47:42.608789577 +0800
+++ mod/makepkg 2013-07-20 09:38:10.861886996 +0800
@@ -48,7 +48,7 @@ declare -r startdir="$PWD"
packaging_options=('strip' 'docs' 'libtool' 'staticlibs' 'emptydirs' 'zipman' \
'purge' 'upx' 'debug')
-other_options=('ccache' 'distcc' 'buildflags' 'makeflags')
+other_options=('ccache' 'distcc' 'buildflags' 'makeflags' 'distfiles')
splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \
'groups' 'depends' 'optdepends' 'provides' 'conflicts' \
'replaces' 'backup' 'options' 'install' 'changelog')
@@ -330,6 +330,11 @@ download_local() {
download_file() {
local netfile=$1
+ if check_buildenv "distfiles" "y" && ! check_option "distfiles" "n"; then
+ distfile=${DISTURL}/$(basename $netfile)
+ wget ${distfile}
+ fi
+
local filepath=$(get_filepath "$netfile")
if [[ -n "$filepath" ]]; then
msg2 "$(gettext "Found %s")" "${filepath##*/}"
To use this option, just add 'distfiles' in BUILDENV and add a line like
DISTURL="http://mirrors.ustc.edu.cn/gentoo/distfiles/"

Answer 1

lolilolicon wrote:
mytbk wrote:
+ if check_buildenv "distfiles" "y" && ! check_option "distfiles" "n"; then
+ distfile=${DISTURL}/$(basename $netfile)
+ wget ${distfile}
+ fi
+
Shouldn't force wget here. Better change the download_sources function, e.g.
- download_file "$netfile"
+ download_file "${DISTURL%/}/${netfile##*/}"
Add in the ifs and elses where appropriate.
Yes, so I need someone better at scripting to help have this complicated job accomplished.
Edit: I think it's a better idea, I'll have a try then.
Last edited by mytbk (2013-07-20 16:20:00)