need my new email_validator library during questions
This commit is contained in:
parent
1b2d07d81d
commit
1f08997a9e
3 changed files with 12 additions and 2 deletions
|
@ -9,13 +9,15 @@ function hide_output {
|
||||||
$@ &> $OUTPUT
|
$@ &> $OUTPUT
|
||||||
|
|
||||||
# If the command failed, show the output that was captured in the temporary file.
|
# If the command failed, show the output that was captured in the temporary file.
|
||||||
if [ $? != 0 ]; then
|
E=$?
|
||||||
|
if [ $E != 0 ]; then
|
||||||
# Something failed.
|
# Something failed.
|
||||||
echo
|
echo
|
||||||
echo FAILED: $@
|
echo FAILED: $@
|
||||||
echo -----------------------------------------
|
echo -----------------------------------------
|
||||||
cat $OUTPUT
|
cat $OUTPUT
|
||||||
echo -----------------------------------------
|
echo -----------------------------------------
|
||||||
|
exit $E
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Remove temporary file.
|
# Remove temporary file.
|
||||||
|
|
|
@ -4,6 +4,7 @@ source setup/functions.sh
|
||||||
|
|
||||||
apt_install python3-flask links duplicity libyaml-dev python3-dnspython python3-dateutil
|
apt_install python3-flask links duplicity libyaml-dev python3-dnspython python3-dateutil
|
||||||
hide_output pip3 install rtyaml "email_validator==0.1.0-rc4"
|
hide_output pip3 install rtyaml "email_validator==0.1.0-rc4"
|
||||||
|
# email_validator is repeated in setup/questions.sh
|
||||||
|
|
||||||
# Create a backup directory and a random key for encrypting backups.
|
# Create a backup directory and a random key for encrypting backups.
|
||||||
mkdir -p $STORAGE_ROOT/backup
|
mkdir -p $STORAGE_ROOT/backup
|
||||||
|
|
|
@ -4,7 +4,14 @@ if [ -z "$NONINTERACTIVE" ]; then
|
||||||
# e.g. if we piped a bootstrapping install script to bash to get started. In that
|
# e.g. if we piped a bootstrapping install script to bash to get started. In that
|
||||||
# case, the nifty '[ -t 0 ]' test won't work. But with Vagrant we must suppress so we
|
# case, the nifty '[ -t 0 ]' test won't work. But with Vagrant we must suppress so we
|
||||||
# use a shell flag instead. Really supress any output from installing dialog.
|
# use a shell flag instead. Really supress any output from installing dialog.
|
||||||
apt_get_quiet install dialog
|
#
|
||||||
|
# Also install depencies needed to validate the email address.
|
||||||
|
echo Installing packages needed for setup...
|
||||||
|
apt_get_quiet install dialog python3 python3-pip || exit 1
|
||||||
|
|
||||||
|
# email_validator is repeated in setup/management.sh
|
||||||
|
hide_output pip3 install "email_validator==0.1.0-rc4" || exit 1
|
||||||
|
|
||||||
message_box "Mail-in-a-Box Installation" \
|
message_box "Mail-in-a-Box Installation" \
|
||||||
"Hello and thanks for deploying a Mail-in-a-Box!
|
"Hello and thanks for deploying a Mail-in-a-Box!
|
||||||
\n\nI'm going to ask you a few questions.
|
\n\nI'm going to ask you a few questions.
|
||||||
|
|
Loading…
Reference in a new issue