--- a/dev/chroot-test/run-test	Sat Dec 18 00:04:05 2010 +0000
+++ b/dev/chroot-test/run-test	Sat Dec 18 12:37:56 2010 +0000
@@ -40,20 +40,17 @@
 touch $BACKING/please-trash-this-system
 mkdir -p $BACKING/etc
 echo "pristine" > $BACKING/etc/debian_chroot
-cp -v dev/chroot-test/policy-rc.d $BACKING/etc/policy-rc.d
+
+SCRIPTS=dev/chroot-test
+
+cp -v $SCRIPTS/policy-rc.d $BACKING/etc/policy-rc.d
 
 mkdir -p $BACKING/var/cache/apt/archives
 echo "Copying deb files out of cache"
 cp $BUILDDIR/aptcache/$DEBVERSION/* $BACKING/var/cache/apt/archives || true
 
-cp -av dev/chroot-test/action $BACKING
-if [ -e debian/rules ] ; then
-    ./dev/debian-build/dbuild 
-    cp build/debian/*.deb $BACKING/action
-else
-    hg st -mac0n -X '*.hg' -X 'dev/**' \
-        | cpio -p -0 -d $BACKING/action/mercurial-server
-fi
+cp -av $SCRIPTS/action $BACKING
+. $SCRIPTS/copy-installables
 
 unionfs-fuse -o cow -o allow_other,suid,dev $BACKING=RW:$PRISTINE=RO $MOUNT