=== modified file 'default.alpine-base.do' --- default.alpine-base.do 2017-11-15 16:26:57 +0000 +++ default.alpine-base.do 2017-11-15 01:12:57 +0000 @@ -16,7 +16,7 @@ for repo in $=vars[repositories]; do # Fetch APKINDEX files to see if they changed depend download-file %filename url=$vars[alpine_mirror]/$vars[release]/$repo/$vars[arch]/APKINDEX.tar.gz - redo-hash $vars[filename] >>&$REDO_DEP_FD || die + redo-hash $vars[filename] # unset "vars[filename]" print -rl - $vars[alpine_mirror]/$vars[release]/$repo >> $vars[build_dir]/etc/apk/repositories || die "failed to set up apk" done === modified file 'default.download-file.do' --- default.download-file.do 2017-11-15 16:26:57 +0000 +++ default.download-file.do 2017-11-15 00:59:59 +0000 @@ -5,12 +5,10 @@ local scheme rest scheme=${vars[url]%%:*} - rest=/${${${vars[url]#*:}#/}#/} - vars[filename]=${DO:h:a}/downloads/${scheme}${rest:a} + rest=${${${vars[url]#*:}#/}#/} + vars[filename]=${DO:h:a}/downloads/$scheme/${rest:a} - wget --timestamping --force-directories --protocol-directories -P downloads $vars[url] \ - || die "Failed to fetch ${(qqq)vars[url]}" - touch -r $vars[filename] $FILE + wget --timestamping --force-directories --protocol-directories -P downloads $vars[url] } . ./common.zsh # vim: fileencoding=utf8 ft=zsh noet sw=4 ts=4 sts=4