Fix --non-interactive behavior: there were still some prompts to the user
This commit is contained in:
parent
a640892ecb
commit
e42af2183c
16
shellpki
16
shellpki
|
@ -239,6 +239,8 @@ init() {
|
||||||
passout_arg=""
|
passout_arg=""
|
||||||
if [ -n "${CA_PASSWORD:-}" ]; then
|
if [ -n "${CA_PASSWORD:-}" ]; then
|
||||||
passout_arg="-passout pass:${CA_PASSWORD}"
|
passout_arg="-passout pass:${CA_PASSWORD}"
|
||||||
|
elif [ "${non_interactive}" -eq 1 ]; then
|
||||||
|
error "In non-interactive mode, you must pass CA_PASSWORD as environment variable."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -f "${CA_KEY}" ]; then
|
if [ ! -f "${CA_KEY}" ]; then
|
||||||
|
@ -255,11 +257,15 @@ init() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "${CA_CERT}" ]; then
|
if [ -f "${CA_CERT}" ]; then
|
||||||
printf "%s already exists, do you really want to erase it ? [y/N] " "${CA_CERT}"
|
if [ "${non_interactive}" -eq 1 ]; then
|
||||||
read -r REPLY
|
error "${CA_CERT} already exists, erase it manually if you want to start over."
|
||||||
resp=$(echo "${REPLY}" | tr 'Y' 'y')
|
else
|
||||||
if [ "${resp}" = "y" ]; then
|
printf "%s already exists, do you really want to erase it ? [y/N] " "${CA_CERT}"
|
||||||
rm "${CA_CERT}"
|
read -r REPLY
|
||||||
|
resp=$(echo "${REPLY}" | tr 'Y' 'y')
|
||||||
|
if [ "${resp}" = "y" ]; then
|
||||||
|
rm "${CA_CERT}"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue