-# make Packages *only* accessable by-hash for this test
-mkdir -p aptarchive/dists/unstable/main/binary-i386/by-hash/SHA512
-(cd aptarchive/dists/unstable/main/binary-i386/by-hash/SHA512 &&
- mv ../../Packages* . &&
- ln -s Packages.gz $(sha512sum Packages.gz|cut -f1 -d' ') )
-
-# add sources
-mkdir -p aptarchive/dists/unstable/main/source/by-hash/SHA512
-(cd aptarchive/dists/unstable/main/source/by-hash/SHA512 &&
- ln -s ../../Sources.gz $(sha512sum ../../Sources.gz|cut -f1 -d' ')
-)
-
-# we moved the Packages file away, normal update won't work
-testfailure aptget update
+# make Packages *only* accessible by-hash for this test
+makebyhashonly() {
+ local NORMAL="$(readlink -f "./aptarchive/dists/unstable/main/${1}")"
+ local BYHASH="${NORMAL}/by-hash/SHA512"
+ mkdir -p "${BYHASH}"
+ find "${NORMAL}/" -maxdepth 1 -name "${2}*" -exec mv '{}' "$BYHASH" \;
+ ln -s "${BYHASH}/${2}.gz" "${BYHASH}/$(sha512sum "${BYHASH}/${2}.gz" | cut -f1 -d' ')"
+}
+makebyhashonly 'binary-i386' 'Packages'
+makebyhashonly 'binary-all' 'Packages'
+makebyhashonly 'source' 'Sources'