Merge "fixed destroy confirmation no properly evaluated"

This commit is contained in:
Zuul 2018-07-03 12:36:56 +00:00 committed by Gerrit Code Review
commit 45c0f0167c

@ -106,6 +106,8 @@ EOF
SHORT_OPTS="hi:p:t:k:e:v"
LONG_OPTS="help,inventory:,playbook:,skip-tags:,tags:,key:,extra:,verbose,configdir:,passwords:,limit:,vault-id:,ask-vault-pass,vault-password-file:,yes-i-really-really-mean-it,include-images,include-dev"
RAW_ARGS="$*"
ARGS=$(getopt -o "${SHORT_OPTS}" -l "${LONG_OPTS}" --name "$0" -- "$@") || { usage >&2; exit 2; }
eval set -- "$ARGS"
@ -159,7 +161,10 @@ while [ "$#" -gt 0 ]; do
;;
(--yes-i-really-really-mean-it)
DANGER_CONFIRM="$1"
if [[ ${RAW_ARGS} =~ "$1" ]]
then
DANGER_CONFIRM="$1"
fi
shift 1
;;