summaryrefslogtreecommitdiff
path: root/mcon/U
diff options
context:
space:
mode:
authorrmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d>2013-01-27 21:38:33 +0000
committerrmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d>2013-01-27 21:38:33 +0000
commit20c74efeeb701e4966e96e2176a573119c30053a (patch)
tree2bfb5a84f8ab88923405f9f384cdc669c7f43ad5 /mcon/U
parent6ba7cb8c936704a5d43606be6d72fe9427d3044b (diff)
Let cf_email.U honor the external MAILDOMAIN environment variable, if set.
git-svn-id: svn://svn.code.sf.net/p/dist/code/trunk/dist@161 2592e710-e01b-42a5-8df0-11608a6cc53d
Diffstat (limited to 'mcon/U')
-rw-r--r--mcon/U/cf_email.U11
1 files changed, 8 insertions, 3 deletions
diff --git a/mcon/U/cf_email.U b/mcon/U/cf_email.U
index caad32e..65c8329 100644
--- a/mcon/U/cf_email.U
+++ b/mcon/U/cf_email.U
@@ -19,7 +19,8 @@
?S: Electronic mail address of the person who ran Configure. This can be
?S: used by units that require the user's e-mail, like MailList.U.
?S:.
-?T:cont
+?T:cont maildomain
+?LINT:extern MAILDOMAIN
: determine the e-mail address of the user who is running us
$cat <<EOM
@@ -32,9 +33,13 @@ your organization...
EOM
cont=x
while test "$cont"; do
+ case "$MAILDOMAIN" in
+ '') maildomain="$myhostname$mydomain";;
+ *) maildomain="$MAILDOMAIN";;
+ esac
case "$cf_email" in
- '') dflt="$cf_by@$myhostname$mydomain";;
- *) dflt="$cf_email";;
+ '') dflt="$cf_by@$maildomain";;
+ *) dflt="$cf_email";;
esac
rp='What is your e-mail address?'
. ./myread