From 3fdcbe542f2d3375333d54e6e720c23c49a86587 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Fri, 2 May 2014 14:22:59 -0400 Subject: [PATCH] don't ask the user to create an email account if the shell is non-interactive and provide a better default for the domain name --- scripts/start.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/start.sh b/scripts/start.sh index 0aec1ab3..e963b071 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -62,14 +62,15 @@ EOF . scripts/web.sh . scripts/webmail.sh +if [ -t 0 ]; then # are we in an interactive shell? if [ -z "`tools/mail.py user`" ]; then # The outut of "tools/mail.py user" is a list of mail users. If there # are none configured, ask the user to configure one. echo echo "Let's create your first mail user." - read -e -i "user@`hostname`" -p "Email Address: " EMAIL_ADDR + read -e -i "user@$PUBLIC_HOSTNAME" -p "Email Address: " EMAIL_ADDR tools/mail.py user add $EMAIL_ADDR # will ask for password tools/mail.py alias add hostmaster@$PUBLIC_HOSTNAME $EMAIL_ADDR tools/mail.py alias add postmaster@$PUBLIC_HOSTNAME $EMAIL_ADDR fi - +fi