summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-11-30 19:15:19 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-11-30 19:15:19 +0100
commit0dc05bf095ebe2908f7d9096b3914b8c988c023e (patch)
treebdb3d8fd048f66b972c8d21f7869b83a3b94cd75 /test
parentf425d4d5d65b317b84fd56ea40f469ca008b7773 (diff)
$! 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…
Diffstat (limited to 'test')
-rw-r--r--test/integration/framework2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/framework b/test/integration/framework
index bc427c544..a0bad4170 100644
--- 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 &
- 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