From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 30 Nov 2010 18:15:19 +0000 (+0100)
Subject: $! doesn't worked on the first try somehow, now it does and its
X-Git-Tag: 0.8.11~5^2^2^2~51
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/0dc05bf095ebe2908f7d9096b3914b8c988c023e

$! 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 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