From de55f6afbf1eb4bf858ff61e07c6fa475269bea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 16 Oct 2015 21:54:09 +0200 Subject: [PATCH] Fix error in stop script --- tests/objectstore/stop-swift-ceph.sh | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/objectstore/stop-swift-ceph.sh b/tests/objectstore/stop-swift-ceph.sh index fcf5fdfdcd..400db8925e 100755 --- a/tests/objectstore/stop-swift-ceph.sh +++ b/tests/objectstore/stop-swift-ceph.sh @@ -23,16 +23,18 @@ if [ -z "$thisFolder" ]; then thisFolder="." fi; -# stopping and removing docker containers -for container in `cat $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift`; do - if [ -n "$DEBUG" ]; then - docker logs $container - fi - echo "Stopping and removing docker container $container" - # kills running container and removes it - docker rm -f $container -done; +if [ -e $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift ]; then + # stopping and removing docker containers + for container in `cat $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift`; do + if [ -n "$DEBUG" ]; then + docker logs $container + fi + echo "Stopping and removing docker container $container" + # kills running container and removes it + docker rm -f $container + done; +fi; # cleanup -rm $thisFolder/swift.config.php -rm $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift \ No newline at end of file +rm -rf $thisFolder/swift.config.php +rm -rf $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift