From bedaa2768506895b22e27b15572ffe4f6be7cd92 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 10 Jul 2017 12:00:27 +0200 Subject: [PATCH] clear output --- build-scripts/docker-build-env/run-docker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/docker-build-env/run-docker.sh b/build-scripts/docker-build-env/run-docker.sh index 03433aa..3cf32a1 100755 --- a/build-scripts/docker-build-env/run-docker.sh +++ b/build-scripts/docker-build-env/run-docker.sh @@ -9,12 +9,12 @@ cleanup() { # Stop docker gracefully echo "[INFO] Stopping in container docker..." DOCKERPIDFILE=/var/run/docker.pid - if [ -f $DOCKERPIDFILE ] && [ -s $DOCKERPIDFILE ] && pgrep -F $DOCKERPIDFILE; then + if [ -f $DOCKERPIDFILE ] && [ -s $DOCKERPIDFILE ] && pgrep -F $DOCKERPIDFILE > /dev/null; then kill "$(cat $DOCKERPIDFILE)" # Now wait for it to die STARTTIME=$(date +%s) ENDTIME=$(date +%s) - while [ -f $DOCKERPIDFILE ] && [ -s $DOCKERPIDFILE ] && pgrep -F $DOCKERPIDFILE; do + while [ -f $DOCKERPIDFILE ] && [ -s $DOCKERPIDFILE ] && pgrep -F $DOCKERPIDFILE > /dev/null; do if [ $((ENDTIME - STARTTIME)) -le $DOCKER_TIMEOUT ]; then sleep 1 ENDTIME=$(date +%s)