install_httpd-2.4.sh: if 'make install' failed, try 'make install' again (is needed for version 2.4.34).

This commit is contained in:
Christoph 2018-08-21 12:54:15 +02:00
parent 9bde9aa13c
commit ae6fce051f

View File

@ -1816,14 +1816,28 @@ else
echo_failed
error "Installing apache-${APACHE_VERSION} failed."
echononl "continue anyway [yes/no]: "
read OK
OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do
echononl "Wrong entry! - repeat [yes/no]: "
read OK
done
[[ $OK = "yes" ]] || fatal "Abbruch durch User"
echononl "\tTrying again..."
echo "## - Trying to install apache-${APACHE_VERSION} again.." >> ${_logdir}/main.log
echo "## -" >> ${_logdir}/main.log
echo "## - See ${_logdir}/httpd-make_install_again.log for more details" >> ${_logdir}/main.log
echo "## -" >> ${_logdir}/main.log
echo "make install > ${_logdir}/httpd-make_install_again.log 2>&1" >> ${_logdir}/main.log
make install > ${_logdir}/httpd-make_install_again.log 2>&1
if [ "$?" = "0" ]; then
echo_ok
else
echo_failed
echononl "continue anyway [yes/no]: "
read OK
OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do
echononl "Wrong entry! - repeat [yes/no]: "
read OK
done
[[ $OK = "yes" ]] || fatal "Abbruch durch User"
fi
fi