Merge "Skip screen if not present"

This commit is contained in:
Jenkins 2012-06-14 19:04:33 +00:00 committed by Gerrit Code Review
commit 0317583d5e

View File

@ -25,10 +25,13 @@ if [[ "$1" == "--all" ]]; then
fi fi
# Shut down devstack's screen to get the bulk of OpenStack services in one shot # Shut down devstack's screen to get the bulk of OpenStack services in one shot
SESSION=$(screen -ls | grep "[0-9].stack" | awk '{ print $1 }') SCREEN=$(which screen)
if [[ -n "$SCREEN" ]]; then
SESSION=$(screen -ls | awk '/[0-9].stack/ { print $1 }')
if [[ -n "$SESSION" ]]; then if [[ -n "$SESSION" ]]; then
screen -X -S $SESSION quit screen -X -S $SESSION quit
fi fi
fi
# Swift runs daemons # Swift runs daemons
if is_service_enabled swift; then if is_service_enabled swift; then