=== modified file 'scripts/digest_to_metalink' --- scripts/digest_to_metalink 2011-11-11 17:01:11 +0000 +++ scripts/digest_to_metalink 2011-11-11 15:13:39 +0000 @@ -2,11 +2,10 @@ BEGIN{ split(urls, url_array, " "); - for(i in url_array){ - split(url_array[i], url_components, ":"); - url_type[i] = url_components[1]; + for(url in url_array){ + split(url, url_components, ":"); + url_type[url] = url_components[1]; } - IFS=" "; } /^[a-fA-F0-9]{32} \S+/{ @@ -36,7 +35,7 @@ print " "; for (i in url_array) { url = url_array[i]; - type = url_type[i]; + type = url_type[url]; print " " url "/" file "" } print " "; === removed file 'scripts/download_txt_stage' --- scripts/download_txt_stage 2011-11-11 17:01:11 +0000 +++ scripts/download_txt_stage 1970-01-01 00:00:00 +0000 @@ -1,26 +0,0 @@ -#!/bin/zsh -# vim: noet ts=4 sts=4 -PS4='+%B%* %F{cyan}%N%f:%F{yellow}%i%f>%b ' -set -x - -tmpdir=${2:-/tmp} - -stage=$( ${0:h}/resolve_txt_uri $1 ) || exit $? - -digest_uri=${stage}.DIGESTS.asc - -digest_file=$( tempfile -d $tmpdir ) || exit $? - -die() { - rcode=$? - rm $digest_file - exit $rcode -} - -wget -q -O $digest_file $digest_uri || die -gpg --verify --batch $digest_file || die -sed -n '/^-----BEGIN PGP SIGNED MESSAGE-----$/,/^-----BEGIN PGP SIGNATURE-----$/p' $digest_file | \ - gawk -v urls=${stage:h} -f ${0:h}/digest_to_metalink # | \ -# aria2c -M - -#(( ${pipestatus[1]} | ${pipestatus[2]} | ${pipestatus[3]} )) && die -#echo ${stage:t} === modified file 'scripts/resolve_txt_uri' (properties changed: +x to -x) --- scripts/resolve_txt_uri 2011-11-11 17:01:11 +0000 +++ scripts/resolve_txt_uri 2011-11-11 12:24:04 +0000 @@ -1,6 +1,5 @@ #!/bin/zsh # vim: noet ts=4 sts=4 -relative=$(wget -qO - $1 | grep -v '^#') -(( ${pipestatus[1]} )) && exit 1 -[[ -z "$relative" ]] && exit 1 +relative=$(wget -qO - $1) +(( $? )) && exit 1 echo "${1:h}/$relative" === modified file 'stagebuilder.prolog' --- stagebuilder.prolog 2011-11-11 17:01:11 +0000 +++ stagebuilder.prolog 2011-11-11 12:10:07 +0000 @@ -261,7 +261,7 @@ script_dir(ScriptDir) }, [ run_outvar([ScriptDir +/+ resolve_txt_uri - ,Mirror +/+ releases +/+ Arch +/+ autobuilds +/+ Txt + ,Mirror +/+ releases +/+ Arch +/+ autobuild +/+ Txt ], digest_uri) , run_outvar([ScriptDir +/+ digest_download , variable(digest_uri)