[Pkg-owncloud-commits] [owncloud] 26/129: Fix error in stop script

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit e3a35506c499b93f291bdaaaa6e9e05492f63bb6
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri Oct 16 21:54:09 2015 +0200

    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 fcf5fdf..400db89 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git