=== modified file 'scripts/download_stage'
--- scripts/download_stage	2011-11-11 21:50:50 +0000
+++ scripts/download_stage	2011-11-11 21:50:27 +0000
@@ -5,19 +5,19 @@
 
 destdir=${2:-.}
 
-digest_uri=${1}.DIGESTS.asc
+digest_uri=$1
 #digest_uri=$( ${0:h}/resolve_txt_uri $1 ).DIGESTS.asc || exit $?
 
 digest=$( wget -q -O - $digest_uri ) || exit $?
 gpg --verify --batch <<<$digest || exit $?
 digest=$( sed -n '/^-----BEGIN PGP SIGNED MESSAGE-----$/,/^-----BEGIN PGP SIGNATURE-----$/p' <<<$digest ) || exit $?
-files=( $( gawk <<<$digest -f ${0:h}/list_digest_files.awk | grep -Ee '\.tar(\.(gz|bz2|lzma|xz))?$' ) )
+files=( $( gawk -f ${0:h}/list_digest_files | grep '\.tar(\.(gz|bz2|lzma|xz))?$' ) )
 if [[ $#files != 1 ]]
 then
 	echo "got $#files tarballs, one expected"
 	exit 1
 fi
-metalink=$( gawk -v urls=${digest_uri:h} -f ${0:h}/digest_to_metalink.awk <<<$digest ) || exit $?
+metalink=$( gawk -v urls=${digest_uri:h} -f ${0:h}/digest_to_metalink <<<$digest ) || exit $?
 
 aria2c --check-integrity=true --dir=$destdir -M - <<<$metalink || exit $?
 echo ${files}

=== modified file 'stagebuilder.prolog'
--- stagebuilder.prolog	2011-11-11 21:50:50 +0000
+++ stagebuilder.prolog	2011-11-11 21:50:27 +0000
@@ -28,11 +28,6 @@
     call(Pred,A,B),
     maplist(Pred,As,Bs).
 
-maplist(_Pred,[    ],[    ],[    ]).
-maplist( Pred,[A|As],[B|Bs],[C|Cs]) :-
-    call(Pred,A,B,C),
-    maplist(Pred,As,Bs,Cs).
-
 prepend(List, List0, List1) :- append(List, List1, List0).
 
 concat([         ], [    ]).
@@ -353,14 +348,6 @@
 echo_package_dir(Dir, echo_append(String, Dir +/+ Tail), Echo) :-
     echo_package(Echo, Tail, String).
 
-dict_append(Key, AppendValue, CurrentValue, ResultValue) :-
-
-
-echo_package_dir_agg([         ], Files, Strings,    Files,    Strings).
-echo_package_dir_agg([Echo|Rest], Files, Strings, AggFiles, AggStrings) :-
-    echo_package(Echo, File, String),
-    (  member(File, AggFiles)
-    ->  
 % echo_packages(Commands, Echos, Dir) :-
 %     maplist(echo_package_dir(Dir), Commands, Echos).