|
@@ -32,13 +32,9 @@ clean_exit() {
|
32
|
32
|
for pid in $(echo $pids)
|
33
|
33
|
do
|
34
|
34
|
echo killing $pid
|
35
|
|
- kill $pid
|
36
|
|
- done
|
37
|
|
- for pid in $(echo $pids)
|
38
|
|
- do
|
39
|
|
- wait $pid
|
40
|
|
- echo $pid killed
|
|
35
|
+ kill $pid 2>/dev/null
|
41
|
36
|
done
|
|
37
|
+ wait $(echo $pids)
|
42
|
38
|
rmdir ${res_file}.lock 2>/dev/null
|
43
|
39
|
rm -v $res_file
|
44
|
40
|
exit 0
|
|
@@ -55,10 +51,9 @@ clean_cidr() {
|
55
|
51
|
for pid in $(echo $cidr_pids $cidr_nmap_pid)
|
56
|
52
|
do
|
57
|
53
|
echo CIDR killing $pid
|
58
|
|
- kill $pid
|
59
|
|
- wait $pid
|
60
|
|
- echo CIDR $pid killed
|
|
54
|
+ kill $pid 2>/dev/null
|
61
|
55
|
done
|
|
56
|
+ wait $(echo $cidr_pids $cidr_nmap_pid)
|
62
|
57
|
rm -v $cidr_nmap_res
|
63
|
58
|
exit 0
|
64
|
59
|
}
|