Merge "Skip screen if not present"
This commit is contained in:
commit
0317583d5e
@ -25,9 +25,12 @@ 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 "$SESSION" ]]; then
|
if [[ -n "$SCREEN" ]]; then
|
||||||
screen -X -S $SESSION quit
|
SESSION=$(screen -ls | awk '/[0-9].stack/ { print $1 }')
|
||||||
|
if [[ -n "$SESSION" ]]; then
|
||||||
|
screen -X -S $SESSION quit
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Swift runs daemons
|
# Swift runs daemons
|
||||||
|
Loading…
Reference in New Issue
Block a user