$! doesn't worked on the first try somehow, now it does and its

(a lot) cleaner than using this ps "magic" as this fails now and then…

diff --git a/test/integration/framework b/test/integration/framework
index bc427c544885e543a4e36be9523e9d8cf6c1559b..a0bad4170fb6a65f35c3ab1e8564e207297f1323 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -445,7 +445,7 @@ signreleasefiles() {
 changetowebserver() {
        if which weborf > /dev/null; then
                weborf -xb aptarchive/ 2>&1 > /dev/null &
 changetowebserver() {
        if which weborf > /dev/null; then
                weborf -xb aptarchive/ 2>&1 > /dev/null &

-               CURRENTTRAP="kill $(ps | grep weborf | sed -e 's#^[ ]*##' | cut -d' ' -f 1); $CURRENTTRAP"
+               CURRENTTRAP="kill $!; $CURRENTTRAP"

                trap "$CURRENTTRAP" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
                local APTARCHIVE="file://$(readlink -f ./aptarchive)"
                for LIST in $(find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list'); do
                trap "$CURRENTTRAP" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
                local APTARCHIVE="file://$(readlink -f ./aptarchive)"
                for LIST in $(find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list'); do