From e93f0e62d02f78e8fd133ed6f36373a69a0049a8 Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Sat, 5 Apr 2003 13:41:36 +0000
Subject: [PATCH] Pulled out questions.py, added a few more niceties.

---
 scripts/setup.py | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/scripts/setup.py b/scripts/setup.py
index 73f6e76b3..b506fa7c6 100644
--- a/scripts/setup.py
+++ b/scripts/setup.py
@@ -29,29 +29,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
-def expect(prompt, possibilities, recursed=False):
-    if recursed:
-        print 'Sorry, that response was not an option.'
-    if possibilities:
-        prompt = '%s [%s]' % (prompt, '/'.join(possibilities))
-    prompt = prompt.strip() + ' '
-    s = raw_input(prompt)
-    if possibilities:
-        if s in possibilities:
-            return s.strip()
-        else:
-            return expect(prompt, possibilities, recursed=True)
-    else:
-        return s.strip()
-
-def anything(prompt):
-    return expect(prompt, [])
-
-def yn(prompt):
-    return expect(prompt, ['y', 'n'])
-
-def ny(prompt):
-    return expect(prompt, ['n', 'y'])
 
 # So we gotta:
 #   Check to see if the user has sqlite installed.
@@ -62,6 +39,7 @@ def ny(prompt):
 import sys
 sys.path.insert(0, 'src')
 from fix import *
+from questions import *
 import os
 import imp
 import conf
@@ -87,7 +65,9 @@ if __name__ == '__main__':
     while not server:
         server = anything('What server would you like to connect to?')
         try:
-            socket.gethostbyname(server)
+            print 'Lookup up %s...' % server
+            ip = socket.gethostbyname(server)
+            print 'Found %s (%s).' % (server, ip)
         except:
             print 'Sorry, but I couldn\'t find that server.'
             server = ''