From 6f52f7c5b132c7e63d3afa2b60bb72c5a081d055 Mon Sep 17 00:00:00 2001 Message-Id: <6f52f7c5b132c7e63d3afa2b60bb72c5a081d055.1714078555.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 2 Jun 2008 22:09:00 +0100 Subject: [PATCH] scripts/setup no longer asks for smtp server Organization: Straylight/Edgeware From: Richard Kettlewell --- scripts/setup.in | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/setup.in b/scripts/setup.in index 541949e..3a0c66b 100755 --- a/scripts/setup.in +++ b/scripts/setup.in @@ -237,12 +237,6 @@ if [ "x$play" = xnetwork ]; then fi fi -if [ -z "$smtp_server" ]; then - echo - echo "What host should DisOrder use as an SMTP server?" - read -r smtp_server -fi - if [ -z "$mail_sender" ]; then while :; do echo @@ -264,7 +258,7 @@ if [ -z "$register" ]; then echo echo "Do you want to enable online registration? (Enter 'y' or 'n')" read -r register - case $reguser in + case $register in y | n ) break ;; @@ -280,7 +274,9 @@ if [ $port = none ]; then else echo " TCP port to listen on: $port" fi -echo " SMTP Server: $smtp_server" +if [ ! -z "$smtp_server" ]; then + echo " SMTP Server: $smtp_server" +fi echo " Sender address: $mail_sender" echo " Online registration: $register" if [ $play = network ]; then @@ -315,7 +311,9 @@ fi if [ $play = network ]; then echo "broadcast $mcast_address $mcast_port" >> pkgconfdir/config.new fi -echo "smtp_server $smtp_server" >> pkgconfdir/config.new +if [ ! -z "$smtp_server" ]; then + echo "smtp_server $smtp_server" >> pkgconfdir/config.new +fi echo "mail_sender $mail_sender" >> pkgconfdir/config.new echo -- [mdw]