From 0981e9da175b4deaf669bb193be97edd75b88bbc Mon Sep 17 00:00:00 2001
From: Fredrik Aslund <fredrik.aslund@umu.se>
Date: Fri, 4 Nov 2016 12:12:46 +0100
Subject: do not use timeout command

---
 scripts/aggregate.sh | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'scripts')

diff --git a/scripts/aggregate.sh b/scripts/aggregate.sh
index fa108398..3d2c47e4 100755
--- a/scripts/aggregate.sh
+++ b/scripts/aggregate.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 aggregate_interval_min=60
-cmd_timeout_s=600
 
 DIR=`pwd`
 ODIR=$1
@@ -22,18 +21,5 @@ grep -v -e '^#' $ODIR/metadata.lst | (while read url cert; do
       cfile=$DIR/certs/$cert
    fi
    cmd="$DIR/scripts/pull-and-verify.sh $url $ODIR $cfile"
-   timeout $cmd_timeout_s $cmd 2>&1
-   ret=$?
-   case $ret in
-   	0)
-		;;
-	124)
-		echo "$cmd timed out after $cmd_timeout_s seconds"
-		exit $ret
-		;;
-	*)
-		echo "$cmd failed with exit code $ret, output:"
-		exit $ret
-		;;
-   esac
+   $cmd || { echo "$cmd returned $ret" ; exit $ret ; }
 done) || exit $ret
-- 
cgit v1.2.3